hemu312/kernel
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

Merge branch 'mr-kernel-5.12.0-0.rc4.175.el9' into 'c9s'

Browse Source 
kernel-5.12.0-0.rc4.175.el9

See merge request redhat/centos-stream/rpms/kernel!1
This commit is contained in:
Herton R. Krzesinski 2021-03-23 13:39:26 +00:00
commit dd886602fd
12 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 170 RHEL_RELEASE = 175
# #
# Early y+1 numbering # Early y+1 numbering

2
kernel-aarch64-debug-rhel.config
View File

@ -1726,7 +1726,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

2
kernel-aarch64-rhel.config
View File

@ -1710,7 +1710,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

2
kernel-ppc64le-debug-rhel.config
View File

@ -1590,7 +1590,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

2
kernel-ppc64le-rhel.config
View File

@ -1574,7 +1574,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

2
kernel-s390x-debug-rhel.config
View File

@ -1590,7 +1590,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

2
kernel-s390x-rhel.config
View File

@ -1574,7 +1574,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

4
kernel-s390x-zfcpdump-rhel.config
View File

@ -1586,7 +1586,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y
@ -6013,7 +6013,7 @@ CONFIG_VEXPRESS_SYSCFG=y
# CONFIG_VFAT_FS is not set # CONFIG_VFAT_FS is not set
CONFIG_VFIO_AP=m CONFIG_VFIO_AP=m
CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m # CONFIG_VFIO is not set
CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set # CONFIG_VFIO_NOIOMMU is not set

2
kernel-x86_64-debug-rhel.config
View File

@ -1693,7 +1693,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

2
kernel-x86_64-rhel.config
View File

@ -1677,7 +1677,7 @@ CONFIG_FUTEX=y
# CONFIG_FW_CACHE is not set # CONFIG_FW_CACHE is not set
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_FW_CFG_SYSFS=y 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_FALLBACK is not set
CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER=y CONFIG_FW_LOADER=y

36
kernel.spec
View File

@ -64,7 +64,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. # For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0 %global released_kernel 0
%global distro_build 0.rc3.170 %global distro_build 0.rc4.175
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -105,13 +105,13 @@ Summary: The Linux kernel
%endif %endif
%define rpmversion 5.12.0 %define rpmversion 5.12.0
%define pkgrelease 0.rc3.170 %define pkgrelease 0.rc4.175
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 12 %define patchlevel 12
# allow pkg_release to have configurable %%{?dist} tag # 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} %define pkg_release %{specrelease}
@ -602,7 +602,7 @@ BuildRequires: asciidoc
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # 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 Source1: Makefile.rhelver
@ -1250,8 +1250,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.12.0-0.rc3.170 -c %setup -q -n kernel-5.12.0-0.rc4.175 -c
mv linux-5.12.0-0.rc3.170 linux-%{KVERREL} mv linux-5.12.0-0.rc4.175 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -2467,10 +2467,12 @@ fi\
# #
%define kernel_variant_posttrans() \ %define kernel_variant_posttrans() \
%{expand:%%posttrans %{?1:%{1}-}core}\ %{expand:%%posttrans %{?1:%{1}-}core}\
%if 0%{!?fedora:1}\
if [ -x %{_sbindir}/weak-modules ]\ if [ -x %{_sbindir}/weak-modules ]\
then\ then\
%{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
fi\ fi\
%endif\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%{nil} %{nil}
@ -2762,18 +2764,18 @@ fi
# #
# #
%changelog %changelog
* Mon Mar 15 2021 Herton R. Krzesinski <herton@redhat.com> [5.12.0-0.rc3.170] * Mon Mar 22 2021 Herton R. Krzesinski <herton@redhat.com> [5.12.0-0.rc4.175]
- v5.12-rc3 rebase - v5.12-rc4 rebase
* Sat Mar 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <kernel-team@fedoraproject.org> [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 <kernel-team@fedoraproject.org> [5.12.0-0.rc3.170]
- Fedora: filters: update to move dfl-emif to modules (Peter Robinson) - 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) - drop duplicate DEVFREQ_GOV_SIMPLE_ONDEMAND config (Peter Robinson)
- efi: The EFI_VARS is legacy and now x86 only (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) - common: enable RTC_SYSTOHC to supplement update_persistent_clock64 (Peter Robinson)

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.12.0-0.rc3.170.tar.xz) = c7ae1fac2a075b467d94962b71c0736c193b732637fc7fb43cdec1ccab010285aeaa330590ba5bec0fbd37f9adc1c8f9c4178cf1bae7f0c9f84ca908588f7dad SHA512 (linux-5.12.0-0.rc4.175.tar.xz) = 473a8184094e36a058f77d8b1410faff10d17e421f092cf2c89f7b1ab1b63b4e39ca73380aa773aa06e14b40219b58871b906ed072250e8cc28f614cb7c86346
SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.170.tar.bz2) = 88195538dc2dbdf69ab958c800803b7ec9d43549db737f21c599cddeb414c2a45891997945364f6a2cdf34c7cf7c5900ead31f5274e7e412330dbb28eb16d6b8 SHA512 (kernel-abi-whitelists-5.12.0-0.rc4.175.tar.bz2) = 37788c6720e91b696723bfcb271ce1b7e5034a592712343172cdcc7976e13772c6d7945535880bb87162c188c3452bfecc1bb5f9015337d24efb87f853186275
SHA512 (kernel-kabi-dw-5.12.0-0.rc3.170.tar.bz2) = 8bae3d7bfffe04e269b5f2cc6e40db24ce661f359632497c9777fb8ac5c8e786772f26ab7fb1ee72d66969f50b4839c35145b1ae1c8a7a8c6c74f90faee23c49 SHA512 (kernel-kabi-dw-5.12.0-0.rc4.175.tar.bz2) = 42da24383db336fcc38bee8fb1f5fd8d7a9819386639318ca0aa7341b404b544986d666c6722c01324ddf6d4adc262104754c371d6a4995822eb2a838c1dfb61