kernel-5.17-0.rc6.5859a2b19911.112

* Thu Mar 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.5859a2b19911.112] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-03-03 12:18:35 -06:00 · 2022-03-03 12:18:35 -06:00 · e06dc60dd0
parent 6c1abf6767
commit e06dc60dd0
21 changed files with 33 additions and 26 deletions
--- 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 = 111
+RHEL_RELEASE = 112

 #
 # Early y+1 numbering
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,5 +1,5 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/f044b2d574e19fdb4549787138788ea9eef94bd2
- f044b2d574e19fdb4549787138788ea9eef94bd2 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/2db9476cc89f60f98f08106fa2ad9d7b31b51e3b
+ 2db9476cc89f60f98f08106fa2ad9d7b31b51e3b mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning

 https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b
 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -3655,6 +3655,7 @@ CONFIG_MACB_PCI=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -2892,8 +2892,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 # CONFIG_MACB is not set
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -3632,6 +3632,7 @@ CONFIG_MACB_PCI=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -2871,8 +2871,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 # CONFIG_MACB is not set
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -3710,6 +3710,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -3688,6 +3688,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -3634,6 +3634,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -3612,6 +3612,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -2721,9 +2721,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 CONFIG_MACB=m
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
-CONFIG_MACINTOSH_DRIVERS=y
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -2703,9 +2703,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 CONFIG_MACB=m
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
-CONFIG_MACINTOSH_DRIVERS=y
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -3052,6 +3052,7 @@ CONFIG_MACB_PCI=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -2698,8 +2698,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 # CONFIG_MACB is not set
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -3029,6 +3029,7 @@ CONFIG_MACB_PCI=m
 CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -2680,8 +2680,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 # CONFIG_MACB is not set
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -2693,8 +2693,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 # CONFIG_MACB is not set
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -2886,9 +2886,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 CONFIG_MACB=m
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
-CONFIG_MACINTOSH_DRIVERS=y
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -2866,9 +2866,8 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 CONFIG_MACB=m
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
-CONFIG_MACINTOSH_DRIVERS=y
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
--- a/kernel.spec
+++ b/kernel.spec
@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0

-%global distro_build 0.rc6.20220302gitfb184c4af9b9.111
+%global distro_build 0.rc6.20220303git5859a2b19911.112

 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@ -132,13 +132,13 @@ Summary: The Linux kernel

 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc6.20220302gitfb184c4af9b9.111
+%define pkgrelease 0.rc6.20220303git5859a2b19911.112

 # This is needed to do merge window version magic
 %define patchlevel 17

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20220302gitfb184c4af9b9.111%{?buildid}%{?dist}
+%define specrelease 0.rc6.20220303git5859a2b19911.112%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -695,7 +695,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc6-54-gfb184c4af9b9.tar.xz
+Source0: linux-5.17-rc6-66-g5859a2b19911.tar.xz

 Source1: Makefile.rhelver

@ -1391,8 +1391,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.17-rc6-54-gfb184c4af9b9 -c
-mv linux-5.17-rc6-54-gfb184c4af9b9 linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc6-66-g5859a2b19911 -c
+mv linux-5.17-rc6-66-g5859a2b19911 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -3005,9 +3005,12 @@ fi
 #
 #
 %changelog
-* Wed Mar 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.fb184c4af9b9.111]
+* Thu Mar 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.5859a2b19911.112]
 - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)

+* Thu Mar 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.5859a2b19911.111]
+- redhat/configs: Disable CONFIG_MACINTOSH_DRIVERS in RHEL. (Prarit Bhargava)
+
 * Wed Mar 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.fb184c4af9b9.110]
 - redhat: Fix "make dist-release-finish" to use the correct NVR variables (Neal Gompa) [2053836]

--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc6-54-gfb184c4af9b9.tar.xz) = b2af7b4a8c3b869f4158f7188b8c5ac77248f685151166d57458ef555f26591b7fd77b76b831e2d51a73543fd397eabb6482b240ef5b5c55c686f7df8b58e49d
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc6.20220302gitfb184c4af9b9.111.tar.bz2) = f79d8bf614a1773e17ee2b2bbdc04922efcef90bebd0aecad527e66d3441a6884e6684bb15f771258e8c0560ec8ae7428d3185d49f0ca7fe2c382b744b4c6747
-SHA512 (kernel-kabi-dw-5.17.0-0.rc6.20220302gitfb184c4af9b9.111.tar.bz2) = f934752da74ee65c1962cf04b3f6cdbb5a7aaacfc4fa2091d356abb5267e4c834bc94d3e6a15ed29151e2e2ec85f4b0d15bba9e123bef88982d7daef25f6d91c
+SHA512 (linux-5.17-rc6-66-g5859a2b19911.tar.xz) = e4ff1acf81177f0704cdd86b8306a331a98ee64d39b252f05dc19de66ff340b1422a16da05ffaf919af09a99d5e2ec809da2e26969163574c44b9a649f843ff7
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc6.20220303git5859a2b19911.112.tar.bz2) = d330143b13fdb52066b1ab7e441e976e705e03f0a64cfe2551442029da8db9b39d6d1bb3ac66a3894db4f60a3d17170f537ab65bc393f20a549c201ff78e8daa
+SHA512 (kernel-kabi-dw-5.17.0-0.rc6.20220303git5859a2b19911.112.tar.bz2) = a554ec4de193ce844708974893c0bc0168786d513b9a4912ed45ad216c03945cea4be425b5fbf1b0b0060a64c07b777109288fcb7ed6c5461a82868b9fe13e50