diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-10 20:49:57 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-10 20:49:57 +0100 |
commit | 4c345964431b56880a9caf3b7cb009a13c6a2668 (patch) | |
tree | 872bffd9f398ecb5a67d23837f537706bd3df1c6 | |
parent | 51b2acc8fcf63b92ed324082ceb161f1bebf58ad (diff) | |
parent | 24dda0d8fe0d8b3518959d738d151689b85fe436 (diff) | |
download | kernel-4c345964431b56880a9caf3b7cb009a13c6a2668.tar.gz kernel-4c345964431b56880a9caf3b7cb009a13c6a2668.tar.xz kernel-4c345964431b56880a9caf3b7cb009a13c6a2668.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.vanilla.1.fc37kernel-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.vanilla.1.fc36kernel-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.vanilla.1.fc35kernel-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.vanilla.1.fc34
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | Patchlist.changelog | 4 | ||||
-rwxr-xr-x | kernel.spec | 18 | ||||
-rw-r--r-- | patch-5.17-redhat.patch | 4 | ||||
-rw-r--r-- | sources | 6 |
5 files changed, 18 insertions, 16 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 2b812721b..ebfb13839 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 = 118 +RHEL_RELEASE = 119 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index f446ccfc1..e7aec0159 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/ae713f9078aa792365a05d600c358ef42f9c0916 - ae713f9078aa792365a05d600c358ef42f9c0916 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +"https://gitlab.com/cki-project/kernel-ark/-/commit"/1fdee68a166dcb5de165b6b27a6648c31d2ecd49 + 1fdee68a166dcb5de165b6b27a6648c31d2ecd49 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 diff --git a/kernel.spec b/kernel.spec index 2f65d19a7..d0eff4e66 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc7.20220309git330f4c53d3c2.118 +%global distro_build 0.rc7.20220310git3bf7edc84a9e.119 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc7.20220309git330f4c53d3c2.118 +%define pkgrelease 0.rc7.20220310git3bf7edc84a9e.119 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20220309git330f4c53d3c2.118%{?buildid}%{?dist} +%define specrelease 0.rc7.20220310git3bf7edc84a9e.119%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -697,7 +697,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc7-64-g330f4c53d3c2.tar.xz +Source0: linux-5.17-rc7-78-g3bf7edc84a9e.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc7-64-g330f4c53d3c2 -c -mv linux-5.17-rc7-64-g330f4c53d3c2 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc7-78-g3bf7edc84a9e -c +mv linux-5.17-rc7-78-g3bf7edc84a9e linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3011,7 +3011,10 @@ fi # # %changelog -* Wed Mar 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.330f4c53d3c2.118] +* Thu Mar 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.3bf7edc84a9e.119] +- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) + +* Thu Mar 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.3bf7edc84a9e.118] - redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava) - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) @@ -3021,7 +3024,6 @@ fi - redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava) -- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) * Tue Mar 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.ea4424be1688.116] - redhat: Unify genspec.sh and kernel.spec variable names (Prarit Bhargava) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 4582d01de..1fb7d55fb 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -176,7 +176,7 @@ index 4c97cb40eebb..caf06cef3d2e 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index f979ec410d6e..7c865dfbe522 100644 +index c842878f8133..72949bfbe1af 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1109,7 +1109,7 @@ endchoice @@ -188,7 +188,7 @@ index f979ec410d6e..7c865dfbe522 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1351,6 +1351,7 @@ config XEN +@@ -1348,6 +1348,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc7-64-g330f4c53d3c2.tar.xz) = 187296de6742823be4be16b71dc0e352df41452ef98f0a1e165176f6f9a3cc426bcd2bb6321cfe8482e766776e04cee1f2ca69d13cd5feb178c84184ea5c70e0 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.20220309git330f4c53d3c2.118.tar.bz2) = c817e1b6b0beaafc8390fd625b24b300602c88add119e515dc80af3de28db5caa5d84f05fc18c1d1e85c239f478c129f300d730208fecee3c6fe40e645f66def -SHA512 (kernel-kabi-dw-5.17.0-0.rc7.20220309git330f4c53d3c2.118.tar.bz2) = 3d5e2460353f95dee12e4ea32cb36b63c186d27ebe63649af2cfb494294f3fbeb5e92c1d6b567b5d5f4dfcdb00b27bf3b82b06756d44c4a3d8c0201a4c4234cf +SHA512 (linux-5.17-rc7-78-g3bf7edc84a9e.tar.xz) = bd8879825b0edbbd8a35569434ec1097807a39a36d9a81be539e17e6535fd8403d469003eb30b1c094e43e126a9289236eac4bd0f7d9e09604bdad61c382f688 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.tar.bz2) = f021a4f01f267de807876b465e9017083dda2f6d8ae4fe3a3ed0c29221798bc2d935ec08bfb0455cce9872182cf69328c04306668d9d45d3a42b02368784cfcf +SHA512 (kernel-kabi-dw-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.tar.bz2) = 0dd08a55fe7b9fcc06647e8885c62ec1cd8615926a2e7827582d0b7644e6834318467d7cf4c5c7c25e69e1d85e35877d20e0e655e0f5fe7be40ffaf8d2fa61ac |