diff --git a/Makefile.rhelver b/Makefile.rhelver index 74f904f52..2be958caa 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 92 +RHEL_RELEASE = 93 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index f250e89ca..d04016232 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1467,6 +1467,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-rhel.config b/kernel-aarch64-rhel.config index a2b8a025c..536b53ad5 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1459,6 +1459,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-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index b0d7897c8..c2ec7bb17 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1273,6 +1273,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-rhel.config b/kernel-ppc64le-rhel.config index dc9df3c8d..929b0b4c4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1265,6 +1265,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-rhel.config b/kernel-s390x-debug-rhel.config index 61012f527..bf5a99af5 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1277,6 +1277,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-rhel.config b/kernel-s390x-rhel.config index c18659e10..846cca6f3 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1269,6 +1269,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 9c3fb9bb7..a281bfc6e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1275,6 +1275,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-rhel.config b/kernel-x86_64-debug-rhel.config index 4c9b1ca11..0f9f8a4ee 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1374,6 +1374,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_MIXED=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 229bd2d14..5eee319c9 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1366,6 +1366,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_MIXED=y diff --git a/kernel.spec b/kernel.spec index ab183567f..ada7719f8 100755 --- a/kernel.spec +++ b/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 92.el9 +%define pkgrelease 93.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 92%{?buildid}%{?dist} +%define specrelease 93%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -676,7 +676,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-92.el9.tar.xz +Source0: linux-5.14.0-93.el9.tar.xz Source1: Makefile.rhelver @@ -1346,8 +1346,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-92.el9 -c -mv linux-5.14.0-92.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-93.el9 -c +mv linux-5.14.0-93.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2973,6 +2973,29 @@ fi # # %changelog +* Tue May 17 2022 Patrick Talbert [5.14.0-93.el9] +- NFSv4 only print the label when its queried (Benjamin Coddington) [2057327] +- nvme: expose cntrltype and dctype through sysfs (John Meneghini) [2045550] +- nvme: send uevent on connection up (John Meneghini) [2045550] +- xfs: punch out data fork delalloc blocks on COW writeback failure (Andrey Albershteyn) [2039058] +- macvlan: Fix leaking skb in source mode with nodst option (Davide Caratti) [2079415] +- net: macvlan: fix potential UAF problem for lowerdev (Davide Caratti) [2079415] +- net: ipvtap: fix template string argument of device_create() call (Davide Caratti) [2079415] +- net: macvtap: fix template string argument of device_create() call (Davide Caratti) [2079415] +- redhat/configs: Set CONFIG_EFI_DISABLE_RUNTIME Kconfig symbol (Javier Martinez Canillas) [2070196] +- efi: Allow to enable EFI runtime services by default on RT (Javier Martinez Canillas) [2070196] +- arm64: Restore forced disabling of KPTI on ThunderX (Mark Salter) [2043737] +- devlink: Clarifies max_macs generic devlink param (Petr Oros) [2073210] +- devlink: Add new "event_eq_size" generic device param (Petr Oros) [2073210] +- devlink: Add new "io_eq_size" generic device param (Petr Oros) [2073210] +- devlink: Simplify devlink resources unregister call (Petr Oros) [2073210] +- devlink: Remove misleading internal_flags from health reporter dump (Petr Oros) [2073210] +- devlink: fix flexible_array.cocci warning (Petr Oros) [2073210] +- devlink: Add 'enable_iwarp' generic device param (Petr Oros) [2073210] +- eth: fwnode: remove the addr len from mac helpers (Íñigo Huguet) [2069566] +- eth: fwnode: change the return type of mac address helpers (Íñigo Huguet) [2069566] +- device property: move mac addr helpers to eth.c (Íñigo Huguet) [2069566] + * Sat May 14 2022 Patrick Talbert [5.14.0-92.el9] - RDMA/hfi1: Fix use-after-free bug for mm struct (Kamal Heib) [2056772] - RDMA/siw: Fix a condition race issue in MPA request processing (Kamal Heib) [2056772] diff --git a/sources b/sources index fe1c2ae70..d71f28222 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-92.el9.tar.xz) = 7f0c9769ee57dcddb775630f532299daf601c07ee6b57ee4cb783201f67b9e8ef1f3038426b9f9fd3861b72429e94ec0e9855f034afe30d5d2206e1eda81d6c3 -SHA512 (kernel-abi-stablelists-5.14.0-92.el9.tar.bz2) = 12d800d039a2f47c37078f44c8cad6a1786ae65ba44832612d59fd8d690bb7e90222f24bd4762f2aff405e3df55d0d435bb7e36e0ab02446b49eb1e67082aa44 -SHA512 (kernel-kabi-dw-5.14.0-92.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 +SHA512 (linux-5.14.0-93.el9.tar.xz) = a9dbcb8d196cdd5326eb2b77a7bb6a669792e6a136b50584a1474fe86add92a85332c1d7977d16da5ac5238bcf6409376f3eb1bc3cd5c7126a7a87eb0aa01b30 +SHA512 (kernel-abi-stablelists-5.14.0-93.el9.tar.bz2) = 86da09dc1430cbe1b91d9bd977c4649e18af33c365fd7fcbd8e0eb0e100ad60c34924826b61aa569a0e2e09977e64f18578378d43aac06ed5729cdae34cf2536 +SHA512 (kernel-kabi-dw-5.14.0-93.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674