From 99cb3e7c58cace1fc8e1dad20c239ce5651ccb2b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 7 Jun 2022 08:44:56 -0500 Subject: kernel-5.18.2-201 * Mon Jun 06 2022 Justin M. Forbes [5.18.2-0] - Add the fedora-stable-release.sh script to generate stable dist-git (Justin M. Forbes) - Add the simpleDRM revert patch so that F35 can be maintained without it (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- kernel.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel.spec b/kernel.spec index 20893bf5d..8873b50ed 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # define buildid .local %define specversion 5.18.2 %define patchversion 5.18 -%define pkgrelease 200 +%define pkgrelease 201 %define kversion 5 %define tarfile_release 5.18.2 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 200%{?buildid}%{?dist} +%define specrelease 201%{?buildid}%{?dist} # # End of genspec.sh variables @@ -3034,6 +3034,9 @@ fi # # %changelog +* Tue Jun 07 2022 Justin M. Forbes [5.18.2-201] +- Fix typo in Makefile for stable Fedora (Justin M. Forbes) + * Mon Jun 06 2022 Justin M. Forbes [5.18.2-0] - Add the fedora-stable-release.sh script to generate stable dist-git (Justin M. Forbes) - Add the simpleDRM revert patch so that F35 can be maintained without it (Justin M. Forbes) diff --git a/sources b/sources index ffac04a33..6b997d0e5 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 SHA512 (linux-5.18.2.tar.xz) = 7e1e4f563ccc9846604de3ca978dfb1a504aef58ddc36113a39eba6ed9bc20f1bd31fa95b26801fd797ee925f9f2b7db1e29753af612b60cad76d699251ac22d -SHA512 (kernel-abi-stablelists-5.18.2-200.tar.bz2) = 42374f46bffb10d3de0c00c2d697240f7dae9b743595e33e89768cdff9ab0771deda28706ce2e9dfb7938e3c6eb54510a0fcddacb50dcb090f07159af761ab6d -SHA512 (kernel-kabi-dw-5.18.2-200.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e +SHA512 (kernel-abi-stablelists-5.18.2-201.tar.bz2) = 84f9afe1a21b757f4b7a6914b24658204210c5629481c71b49bf711a0ea7168e541ebcb24377095a6678eb7d57f519320679d4514de7640651b134ce5901fc93 +SHA512 (kernel-kabi-dw-5.18.2-201.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e -- cgit From 44ff646f83169d792167d1deec0e11a431fc8041 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 9 Jun 2022 07:54:50 -0500 Subject: kernel-5.18.3-200 * Thu Jun 09 2022 Justin M. Forbes [5.18.3-0] - Config updates for stable backports (Justin M. Forbes) - Fix typo in Makefile for stable Fedora (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- kernel-aarch64-debug-fedora.config | 3 ++- kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 3 ++- kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 3 ++- kernel-armv7hl-fedora.config | 3 ++- kernel-armv7hl-lpae-debug-fedora.config | 3 ++- kernel-armv7hl-lpae-fedora.config | 3 ++- kernel-ppc64le-debug-fedora.config | 3 ++- kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 3 ++- kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 3 ++- kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 3 ++- kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 3 ++- kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 3 ++- kernel-x86_64-rhel.config | 1 + kernel.spec | 11 ++++----- patch-5.18-redhat.patch | 40 ++++++++++++++++----------------- sources | 6 ++--- 24 files changed, 62 insertions(+), 40 deletions(-) diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4fffd8615..fe22df0ad 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2060,6 +2060,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y CONFIG_EFI_PGT_DUMP=y @@ -5640,7 +5641,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1d2debd1e..995346621 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1567,6 +1567,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index ab204c0c5..d260ca1c1 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2052,6 +2052,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y # CONFIG_EFI_PGT_DUMP is not set @@ -5619,7 +5620,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 845952cd6..b2206a48c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1559,6 +1559,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f56f90904..53b771082 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2081,6 +2081,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y CONFIG_EFI_PGT_DUMP=y @@ -5703,7 +5704,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8f26a7b9f..75364890a 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2074,6 +2074,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y # CONFIG_EFI_PGT_DUMP is not set @@ -5684,7 +5685,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index ea7d7f10e..f2aec007a 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2035,6 +2035,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y CONFIG_EFI_PGT_DUMP=y @@ -5551,7 +5552,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ac8474142..d1f7b83b8 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2028,6 +2028,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y # CONFIG_EFI_PGT_DUMP is not set @@ -5532,7 +5533,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 32ce905b4..bcab720ff 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1617,6 +1617,7 @@ CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y CONFIG_EFI_PGT_DUMP=y @@ -4736,7 +4737,7 @@ CONFIG_R6040=m CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index f44024635..a486a584e 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1415,6 +1415,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 83c0314cb..750d9350e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1608,6 +1608,7 @@ CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y # CONFIG_EFI_PGT_DUMP is not set @@ -4715,7 +4716,7 @@ CONFIG_R6040=m CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index de6292562..4e839540d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1407,6 +1407,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index eb5088a52..b1cdf0bda 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1624,6 +1624,7 @@ CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y CONFIG_EFI_PGT_DUMP=y @@ -4676,7 +4677,7 @@ CONFIG_R6040=m CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index a81797974..ad098ca6b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1420,6 +1420,7 @@ CONFIG_EDAC_PND2=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7c057e0d4..ed242b460 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1615,6 +1615,7 @@ CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y # CONFIG_EFI_PGT_DUMP is not set @@ -4655,7 +4656,7 @@ CONFIG_R6040=m CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 1334069ae..483cf415f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1412,6 +1412,7 @@ CONFIG_EDAC_PND2=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 2c0752dc4..c6c6023a2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1417,6 +1417,7 @@ CONFIG_EDAC_PND2=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y CONFIG_EFI_PARTITION=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ef36f3973..0609b173a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1767,6 +1767,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_DXE_MEM_ATTRIBUTES=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y @@ -5072,7 +5073,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 77f68fa2a..726b7a6a9 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1515,6 +1515,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_DXE_MEM_ATTRIBUTES=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e9bf227c0..956914673 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1758,6 +1758,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_DXE_MEM_ATTRIBUTES=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y @@ -5052,7 +5053,7 @@ CONFIG_R6040=m CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_SHARK2=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d5537ee06..27b5ed329 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1507,6 +1507,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_CAPSULE_LOADER is not set CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_DXE_MEM_ATTRIBUTES=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y diff --git a/kernel.spec b/kernel.spec index 8873b50ed..da89e41f5 100755 --- a/kernel.spec +++ b/kernel.spec @@ -122,15 +122,15 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 5.18.2 +%define specversion 5.18.3 %define patchversion 5.18 -%define pkgrelease 201 +%define pkgrelease 200 %define kversion 5 -%define tarfile_release 5.18.2 +%define tarfile_release 5.18.3 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 201%{?buildid}%{?dist} +%define specrelease 200%{?buildid}%{?dist} # # End of genspec.sh variables @@ -3034,7 +3034,8 @@ fi # # %changelog -* Tue Jun 07 2022 Justin M. Forbes [5.18.2-201] +* Thu Jun 09 2022 Justin M. Forbes [5.18.3-0] +- Config updates for stable backports (Justin M. Forbes) - Fix typo in Makefile for stable Fedora (Justin M. Forbes) * Mon Jun 06 2022 Justin M. Forbes [5.18.2-0] diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 12101f9fc..0e0d6b500 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -44,7 +44,7 @@ 43 files changed, 712 insertions(+), 191 deletions(-) diff --git a/Makefile b/Makefile -index 6b1d606a92f6..548f077c486c 100644 +index eb3adfec0b22..a9fcb4a575ea 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -359,7 +359,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index f1827257ef0e..5a45c2cd3dc2 100644 +index 2610e809c802..4f04a6bcf2e9 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -394,7 +394,7 @@ index f1827257ef0e..5a45c2cd3dc2 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig -index 2c3dac5ecb36..f44f8b746e42 100644 +index 243882f5e5f9..4a0fa81a563d 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -91,6 +91,18 @@ config EFI_SOFT_RESERVE @@ -429,7 +429,7 @@ index c02ff25dd477..d860f8eb9a81 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 5502e176d51b..93b61ca552d6 100644 +index ff57db8f8d05..d7dfde3260bf 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -1307,7 +1307,7 @@ index 857d4c2fd1a2..9353941f3a97 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index e1846d04817f..9725d5f03eee 100644 +index 2d6a01853109..f22cd4b9c118 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1443,10 +1443,10 @@ index a2b53ca63335..021e51c64cde 100644 { } diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index da829274fc66..bb6e79ec3d00 100644 +index 41aeaa235132..e8137d31cc93 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4284,6 +4284,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4285,6 +4285,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -1496,7 +1496,7 @@ index 1460857026e0..7e1964891089 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/include/linux/efi.h b/include/linux/efi.h -index ccd4d3f91c98..2241dfa131e7 100644 +index cc6d2be2ffd5..418d814d2eb7 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -1508,7 +1508,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -383,6 +385,7 @@ void efi_native_runtime_setup(void); +@@ -385,6 +387,7 @@ void efi_native_runtime_setup(void); #define EFI_LOAD_FILE_PROTOCOL_GUID EFI_GUID(0x56ec3091, 0x954c, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) #define EFI_LOAD_FILE2_PROTOCOL_GUID EFI_GUID(0x4006c0c1, 0xfcb3, 0x403e, 0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d) #define EFI_RT_PROPERTIES_TABLE_GUID EFI_GUID(0xeb66918a, 0x7eef, 0x402a, 0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9) @@ -1516,7 +1516,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 #define EFI_IMAGE_SECURITY_DATABASE_GUID EFI_GUID(0xd719b2cb, 0x3d3a, 0x4596, 0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f) #define EFI_SHIM_LOCK_GUID EFI_GUID(0x605dab50, 0xe046, 0x4300, 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23) -@@ -435,6 +438,7 @@ typedef struct { +@@ -437,6 +440,7 @@ typedef struct { } efi_config_table_type_t; #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL) @@ -1524,7 +1524,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 #define EFI_2_30_SYSTEM_TABLE_REVISION ((2 << 16) | (30)) #define EFI_2_20_SYSTEM_TABLE_REVISION ((2 << 16) | (20)) -@@ -829,6 +833,14 @@ extern int __init efi_setup_pcdp_console(char *); +@@ -831,6 +835,14 @@ extern int __init efi_setup_pcdp_console(char *); #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ @@ -1539,7 +1539,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 #ifdef CONFIG_EFI /* -@@ -840,6 +852,8 @@ static inline bool efi_enabled(int feature) +@@ -842,6 +854,8 @@ static inline bool efi_enabled(int feature) } extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); @@ -1548,7 +1548,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 bool __pure __efi_soft_reserve_enabled(void); static inline bool __pure efi_soft_reserve_enabled(void) -@@ -860,6 +874,8 @@ static inline bool efi_enabled(int feature) +@@ -862,6 +876,8 @@ static inline bool efi_enabled(int feature) static inline void efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {} @@ -1557,7 +1557,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 static inline bool efi_soft_reserve_enabled(void) { return false; -@@ -872,6 +888,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) +@@ -874,6 +890,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) #endif extern int efi_status_to_err(efi_status_t status); @@ -1565,7 +1565,7 @@ index ccd4d3f91c98..2241dfa131e7 100644 /* * Variable Attributes -@@ -1124,13 +1141,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1126,13 +1143,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); @@ -1645,10 +1645,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index ddcbefe535e9..5061ef5ba38b 100644 +index b19e2eeaae80..7d12d49b9024 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1649,7 +1649,7 @@ config AIO +@@ -1654,7 +1654,7 @@ config AIO this option saves about 7k. config IO_URING @@ -1692,10 +1692,10 @@ index 16d475b3e203..4e333f14b84e 100755 # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope} # to force full paths for a non-O= build diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index 5f45c3c07dbd..86609ec63b86 100644 +index 093894a640dc..1c43a9462b4b 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c -@@ -47,7 +47,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -73,7 +73,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, return NULL; if (*status != EFI_BUFFER_TOO_SMALL) { @@ -1705,7 +1705,7 @@ index 5f45c3c07dbd..86609ec63b86 100644 return NULL; } -@@ -58,7 +59,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -84,7 +85,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, *status = efi.get_variable(name, guid, NULL, &lsize, db); if (*status != EFI_SUCCESS) { kfree(db); diff --git a/sources b/sources index 6b997d0e5..9957ca4a9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 -SHA512 (linux-5.18.2.tar.xz) = 7e1e4f563ccc9846604de3ca978dfb1a504aef58ddc36113a39eba6ed9bc20f1bd31fa95b26801fd797ee925f9f2b7db1e29753af612b60cad76d699251ac22d -SHA512 (kernel-abi-stablelists-5.18.2-201.tar.bz2) = 84f9afe1a21b757f4b7a6914b24658204210c5629481c71b49bf711a0ea7168e541ebcb24377095a6678eb7d57f519320679d4514de7640651b134ce5901fc93 -SHA512 (kernel-kabi-dw-5.18.2-201.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e +SHA512 (linux-5.18.3.tar.xz) = fd238473a3216e1fbdaefd983adb9fc5b3bb1f6d50cdee8ce20f7b894af1558d0664a7d8b0e47eb72943ffb127582d9fc5c9b8ef0a461ad5b689389c33814391 +SHA512 (kernel-abi-stablelists-5.18.3-200.tar.bz2) = e557b3409a2ac0af4a01a41ad082bd4ad0adb83de075b3df473e66f59299052e161cd3f83a329fd9e69405d41e64479c37c908557de54772cc5093932d4797f7 +SHA512 (kernel-kabi-dw-5.18.3-200.tar.bz2) = fd295588c7bf44f52530eef6801ac19fc2db90721987279223daf23bc393775b8fd1f96faebf551201256d76c3c9263256e7de9eaa4635a66d2b2acb108e92c5 -- cgit