From 38e7304542efe54ecc96bcfbccbafc8750abcaf8 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 22 Dec 2021 10:26:20 -0600 Subject: kernel-5.16-0.rc6.20211221git59b3f9448833.42 * Tue Dec 21 2021 Fedora Kernel Team [5.16-0.rc6.20211221git59b3f9448833.42] - Update rebase-notes with dracut 5.17 information (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.spec | 12 ++++++------ patch-5.16-redhat.patch | 4 ++-- sources | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index cbc71de3a..555eaf7f5 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 = 42 +RHEL_RELEASE = 43 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 9a7e66b9a..7c4607478 100755 --- 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.20211221git59b3f9448833.42 +%global distro_build 0.rc6.20211222git2f47a9a4dfa3.43 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc6.20211221git59b3f9448833.42 +%define pkgrelease 0.rc6.20211222git2f47a9a4dfa3.43 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20211221git59b3f9448833.42%{?buildid}%{?dist} +%define specrelease 0.rc6.20211222git2f47a9a4dfa3.43%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -689,7 +689,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc6-6-g59b3f9448833.tar.xz +Source0: linux-5.16-rc6-31-g2f47a9a4dfa3.tar.xz Source1: Makefile.rhelver @@ -1383,8 +1383,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc6-6-g59b3f9448833 -c -mv linux-5.16-rc6-6-g59b3f9448833 linux-%{KVERREL} +%setup -q -n kernel-5.16-rc6-31-g2f47a9a4dfa3 -c +mv linux-5.16-rc6-31-g2f47a9a4dfa3 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 7d24b0f5a..c773f284c 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -75,10 +75,10 @@ 74 files changed, 1512 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 9725c546a0d4..4d440bdcf5b9 100644 +index fc34332c8d9a..85f96e7a5005 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5936,6 +5936,15 @@ +@@ -5940,6 +5940,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. diff --git a/sources b/sources index a441e12b4..19e4a800e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-rc6-6-g59b3f9448833.tar.xz) = 10ef46413f13d4e5a90c23a8dff787d8a6ed9ec261758516a7dbc281669f074f32f47e6d29299de455e78f472f4ba2443f1b1d54ec61eb1a42b0071be9e5b417 -SHA512 (kernel-abi-stablelists-5.16.0-0.rc6.20211221git59b3f9448833.42.tar.bz2) = 68be8240050882acc3cb48f34cb399888b0f9c5fbe7f80b1eff504659f96e65443ee4f5bb8a07969c1141bff31f21766aea2a879cdb047d49a48ffaee786d9b8 -SHA512 (kernel-kabi-dw-5.16.0-0.rc6.20211221git59b3f9448833.42.tar.bz2) = ae992838dc2b14f37a6c76adf0cf4ccee838e6f43ab4a67b92d734e026151783dce9e44823e8da6e539b8e980ebd1e7dee74cb753172f1d4432de29deafe7c5b +SHA512 (linux-5.16-rc6-31-g2f47a9a4dfa3.tar.xz) = f350ea4a4665d0b47577b84e571e0b72d9fd4340b8381a9cc57b7a268f76f38d6b09af79cd6d739f071c8a4002328b7bf3fd63cc7783c47024a13d9dd1258e2e +SHA512 (kernel-abi-stablelists-5.16.0-0.rc6.20211222git2f47a9a4dfa3.43.tar.bz2) = e8db559066ba45defcae861c4f80a4a2f523ed3bb8d38143e12faf8a8a93082d1aaa2f35700ba78b1cef5fb87253ffee66d0c4aaed67d47e7aa4ca26147bcb37 +SHA512 (kernel-kabi-dw-5.16.0-0.rc6.20211222git2f47a9a4dfa3.43.tar.bz2) = 79dc6427d310318d731f161a24474ed9bfbc165fbd792882e13ece590bf8e5dcf0e6d46686a29959f0688f227fded0254c9bf8ba2e350ba6472d1fa9cfcb9b2a -- cgit