From e329da546ac24b9c9a289a8e896970b6de14bc7b Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Mon, 22 Mar 2021 16:10:08 -0400 Subject: [PATCH] kernel-5.12.0-0.rc4.175.el9 * Mon Mar 22 2021 Herton R. Krzesinski [5.12.0-0.rc4.175] - v5.12-rc4 rebase - CONFIG_VFIO now selects IOMMU_API instead of depending on it, causing several config mismatches for the zfcpdump kernel (Justin M. Forbes) - Turn off weak-modules for Fedora (Justin M. Forbes) - redhat: enable CONFIG_FW_LOADER_COMPRESS for ARK (Herton R. Krzesinski) [1939095] Resolves: rhbz#1939095 Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 4 ++-- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 36 ++++++++++++++++--------------- sources | 6 +++--- 12 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9b69d64ce..6ce5e49d4 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 170 +RHEL_RELEASE = 175 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 48022a439..b9c684871 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1726,7 +1726,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a8f672ce3..367ece2b0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1710,7 +1710,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index f13c50c65..ae84b352a 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1590,7 +1590,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 223c4179d..af3730c42 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1574,7 +1574,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3ee8fbc80..ca88a5d86 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1590,7 +1590,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 9b6d7d555..041fd97d4 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1574,7 +1574,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 15c47108c..0f12d627f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1586,7 +1586,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y @@ -6013,7 +6013,7 @@ CONFIG_VEXPRESS_SYSCFG=y # CONFIG_VFAT_FS is not set CONFIG_VFIO_AP=m CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO=m +# CONFIG_VFIO is not set CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 2b3558709..4da09c0ca 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1693,7 +1693,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 808dae08b..5d90e6ac7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1677,7 +1677,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel.spec b/kernel.spec index a47cd6a60..758496c36 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.170 +%global distro_build 0.rc4.175 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc3.170 +%define pkgrelease 0.rc4.175 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.170%{?buildid}%{?dist} +%define specrelease 0.rc4.175%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -602,7 +602,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12.0-0.rc3.170.tar.xz +Source0: linux-5.12.0-0.rc4.175.tar.xz Source1: Makefile.rhelver @@ -1250,8 +1250,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12.0-0.rc3.170 -c -mv linux-5.12.0-0.rc3.170 linux-%{KVERREL} +%setup -q -n kernel-5.12.0-0.rc4.175 -c +mv linux-5.12.0-0.rc4.175 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2467,10 +2467,12 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ +%if 0%{!?fedora:1}\ if [ -x %{_sbindir}/weak-modules ]\ then\ %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ fi\ +%endif\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2762,18 +2764,18 @@ fi # # %changelog -* Mon Mar 15 2021 Herton R. Krzesinski [5.12.0-0.rc3.170] -- v5.12-rc3 rebase +* Mon Mar 22 2021 Herton R. Krzesinski [5.12.0-0.rc4.175] +- v5.12-rc4 rebase + +* Sat Mar 20 2021 Fedora Kernel Team [5.12.0-0.rc3.20210320git1c273e10bc0c.173] +- CONFIG_VFIO now selects IOMMU_API instead of depending on it, causing several config mismatches for the zfcpdump kernel (Justin M. Forbes) + +* Thu Mar 18 2021 Fedora Kernel Team [5.12.0-0.rc3.20210318git6417f03132a6.171] +- Turn off weak-modules for Fedora (Justin M. Forbes) +- redhat: enable CONFIG_FW_LOADER_COMPRESS for ARK (Herton R. Krzesinski) [1939095] + +* Mon Mar 15 2021 Fedora Kernel Team [5.12.0-0.rc3.170] - Fedora: filters: update to move dfl-emif to modules (Peter Robinson) -- [redhat] arm: unify EFI vars (Jeremy Linton) -- [redhat] arm: Unify CPU_THERMAL (Jeremy Linton) -- [redhat] arm: move SPE to generic (Jeremy Linton) -- [redhat] aarch64: sync and enable some arm interconnect PMUs (Jeremy Linton) -- [redhat] arm: move psci checker disable to common (Jeremy Linton) -- [redhat] aarch64: SW_TTBR_PAN globally on (Jeremy Linton) -- [redhat] aarch64: Move arm64_tlb_range to common (Jeremy Linton) -- [redhat] aarch64: Enable hotplug memory (Jeremy Linton) -- [redhat] aarch64: ACPI/CPPC can be a module (Jeremy Linton) - drop duplicate DEVFREQ_GOV_SIMPLE_ONDEMAND config (Peter Robinson) - efi: The EFI_VARS is legacy and now x86 only (Peter Robinson) - common: enable RTC_SYSTOHC to supplement update_persistent_clock64 (Peter Robinson) diff --git a/sources b/sources index 2dfa08306..8c680f796 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.0-0.rc3.170.tar.xz) = c7ae1fac2a075b467d94962b71c0736c193b732637fc7fb43cdec1ccab010285aeaa330590ba5bec0fbd37f9adc1c8f9c4178cf1bae7f0c9f84ca908588f7dad -SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.170.tar.bz2) = 88195538dc2dbdf69ab958c800803b7ec9d43549db737f21c599cddeb414c2a45891997945364f6a2cdf34c7cf7c5900ead31f5274e7e412330dbb28eb16d6b8 -SHA512 (kernel-kabi-dw-5.12.0-0.rc3.170.tar.bz2) = 8bae3d7bfffe04e269b5f2cc6e40db24ce661f359632497c9777fb8ac5c8e786772f26ab7fb1ee72d66969f50b4839c35145b1ae1c8a7a8c6c74f90faee23c49 +SHA512 (linux-5.12.0-0.rc4.175.tar.xz) = 473a8184094e36a058f77d8b1410faff10d17e421f092cf2c89f7b1ab1b63b4e39ca73380aa773aa06e14b40219b58871b906ed072250e8cc28f614cb7c86346 +SHA512 (kernel-abi-whitelists-5.12.0-0.rc4.175.tar.bz2) = 37788c6720e91b696723bfcb271ce1b7e5034a592712343172cdcc7976e13772c6d7945535880bb87162c188c3452bfecc1bb5f9015337d24efb87f853186275 +SHA512 (kernel-kabi-dw-5.12.0-0.rc4.175.tar.bz2) = 42da24383db336fcc38bee8fb1f5fd8d7a9819386639318ca0aa7341b404b544986d666c6722c01324ddf6d4adc262104754c371d6a4995822eb2a838c1dfb61