diff --git a/base/comps/kernel/6.18-x86_64-azl.config b/base/comps/kernel/6.18-x86_64-azl.config index 47be8bfd15d..95d6bf2af83 100644 --- a/base/comps/kernel/6.18-x86_64-azl.config +++ b/base/comps/kernel/6.18-x86_64-azl.config @@ -671,7 +671,7 @@ CONFIG_ACPI_HMAT=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_ACPI_APEI=y -# CONFIG_ACPI_APEI_GHES is not set +CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set @@ -6179,7 +6179,7 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y CONFIG_INFINIBAND_VIRT_DMA=y -# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_INFINIBAND_BNXT_RE=m # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m CONFIG_INFINIBAND_ERDMA=m diff --git a/base/comps/kernel/kernel.azl.macros b/base/comps/kernel/kernel.azl.macros index e2e2d29bc43..18fdabce526 100644 --- a/base/comps/kernel/kernel.azl.macros +++ b/base/comps/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Removed once these defines move directly into kernel.spec. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 9 +%azl_pkgrelease 11 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/base/comps/kernel/kernel.spec b/base/comps/kernel/kernel.spec index ead1ac54a9f..054b0cf9dc3 100644 --- a/base/comps/kernel/kernel.spec +++ b/base/comps/kernel/kernel.spec @@ -4575,6 +4575,12 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.11 +- feat(kernel): enable ACPI APEI GHES (Generic Hardware Error Source) on x86_64 + +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.10 +- feat(kernel): enable Broadcom RoCE driver (bnxt_re) as module on x86_64 + * Thu Jul 23 2026 Rachel Menge - 6.18.31-1.9 - feat(kernel): convert component to local spec diff --git a/locks/kernel.lock b/locks/kernel.lock index a888e9d96d1..3d37a407e4c 100644 --- a/locks/kernel.lock +++ b/locks/kernel.lock @@ -1,4 +1,4 @@ # Managed by azldev component update. Do not edit manually. version = 1 -input-fingerprint = 'sha256:4e4d424d225920f299c3475a3a4d866822f501de3e8d1db2dfe53b8b9d92e6ac' +input-fingerprint = 'sha256:035dd07045148e5cb73e2ec0231f0494d328b2122938303450035ff378eb9435' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json index 78585918892..8d817fa3c7e 100644 --- a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json +++ b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json @@ -3014,6 +3014,16 @@ { "name": "kernel", "kernel_configs": [ + { + "name": "CONFIG_ACPI_APEI_GHES", + "values": [ + { + "architecture": "x86_64", + "value": "y" + } + ], + "justification": "Enable firmware-first hardware error reporting through ACPI APEI GHES on x86_64 - Work item: https://microsoft.visualstudio.com/OS/_workitems/edit/63295066" + }, { "name": "CONFIG_DRM_ACCEL_IVPU", "values": [ @@ -3233,9 +3243,9 @@ { "name": "CONFIG_INFINIBAND_BNXT_RE", "values": [ - { "architecture": "x86_64", "value": "n" } + { "architecture": "x86_64", "value": "m" } ], - "justification": "Align kernel 6.18 with its generated configuration" + "justification": "https://microsoft.visualstudio.com/OS/_workitems/edit/63295045" }, { "name": "CONFIG_IP_VS_DEBUG", diff --git a/specs/k/kernel/6.18-x86_64-azl.config b/specs/k/kernel/6.18-x86_64-azl.config index 47be8bfd15d..95d6bf2af83 100644 --- a/specs/k/kernel/6.18-x86_64-azl.config +++ b/specs/k/kernel/6.18-x86_64-azl.config @@ -671,7 +671,7 @@ CONFIG_ACPI_HMAT=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_ACPI_APEI=y -# CONFIG_ACPI_APEI_GHES is not set +CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set @@ -6179,7 +6179,7 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y CONFIG_INFINIBAND_VIRT_DMA=y -# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_INFINIBAND_BNXT_RE=m # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m CONFIG_INFINIBAND_ERDMA=m diff --git a/specs/k/kernel/kernel.azl.macros b/specs/k/kernel/kernel.azl.macros index e2e2d29bc43..18fdabce526 100644 --- a/specs/k/kernel/kernel.azl.macros +++ b/specs/k/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Removed once these defines move directly into kernel.spec. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 9 +%azl_pkgrelease 11 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/specs/k/kernel/kernel.spec b/specs/k/kernel/kernel.spec index 094e134d7c9..38065e06a6f 100644 --- a/specs/k/kernel/kernel.spec +++ b/specs/k/kernel/kernel.spec @@ -4578,6 +4578,12 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.11 +- feat(kernel): enable ACPI APEI GHES (Generic Hardware Error Source) on x86_64 + +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.10 +- feat(kernel): enable Broadcom RoCE driver (bnxt_re) as module on x86_64 + * Thu Jul 23 2026 Rachel Menge - 6.18.31-1.9 - feat(kernel): convert component to local spec