From 11cdcc6e3038b0d24c68f9820e6095ac15757a65 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 29 Dec 2021 13:25:42 -0600
Subject: kernel-5.16-0.rc6.20211224git7a29b11da965.45

* Fri Dec 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211224git7a29b11da965.45]
- Fedora configs for 5.16 pt 1 (Justin M. Forbes)
- redhat/configs: NFS: disable UDP, insecure enctypes (Benjamin Coddington) [1952863]
Resolves: rhbz#1952863

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver        |  2 +-
 kernel.spec             | 14 +++++++-------
 patch-5.16-redhat.patch |  2 +-
 sources                 |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index eb465391b..4f797970e 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 = 48
+RHEL_RELEASE = 50
 
 #
 # Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 88a7bf17f..493a84d2e 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
-%global distro_build 0.rc7.48
+%global distro_build 0.rc7.20211229gite7c124bd0463.50
 
 %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.rc7.48
+%define pkgrelease 0.rc7.20211229gite7c124bd0463.50
 
 # This is needed to do merge window version magic
 %define patchlevel 16
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.48%{?buildid}%{?dist}
+%define specrelease 0.rc7.20211229gite7c124bd0463.50%{?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-rc7.tar.xz
+Source0: linux-5.16-rc7-9-ge7c124bd0463.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1383,8 +1383,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16-rc7 -c
-mv linux-5.16-rc7 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc7-9-ge7c124bd0463 -c
+mv linux-5.16-rc7-9-ge7c124bd0463 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index d63157d45..029143a7b 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -2141,7 +2141,7 @@ index 778b57b1f020..2a152330076d 100644
 
  	if (xfs_has_discard(mp)) {
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index dbd39b20e034..8127dcbe5a6e 100644
+index ef8dbc0a1522..836a5dfc6156 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -43,6 +43,8 @@
diff --git a/sources b/sources
index 947308475..781aa3494 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc7.tar.xz) = d96360f417c9106f0198c726d48ecfa223742a7aead3b8986e99b4f77cd873d7b0a20a58023ba2d80f04ee6159f8bc9638bc49fea04a73bb6b0d0d88e13c335a
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc7.48.tar.bz2) = 75f47b3b85e7fc79820b6f358810793b0e00b1c0c87914013a0503821016f29213df16f57e88527db61601ce96c0d1f1620f7944cfeec4fca2117dfacba82a20
-SHA512 (kernel-kabi-dw-5.16.0-0.rc7.48.tar.bz2) = 241f6e0b575c7c61d35de1118b2740c2564c337995a5dbe9cd5a8da73f6451fb5ff02492507277c2539c426fa19ffcdcdcfc750d3f41b0d1c5f1db056106a705
+SHA512 (linux-5.16-rc7-9-ge7c124bd0463.tar.xz) = 8b4654d0f11d10f897eccd8d55b3341a1658a00e0ff089488525c2f43e7682f8c2083f29b46bd220e9a5aa21caededccf640dc95562f5fd379154af8dc0805a6
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc7.20211229gite7c124bd0463.50.tar.bz2) = 1adab3cd95e9f3fc0ec162f4457141d033a19b61fd467d722fa35161d0725213b93cabff5dfba89a5b533d5b3e759a8a24a02686443ebac4ffb6ebf447463e78
+SHA512 (kernel-kabi-dw-5.16.0-0.rc7.20211229gite7c124bd0463.50.tar.bz2) = e370b48397aadcfcb93304dad8494a832c78aa2b35dbe72f8ddf91cae3430001b767fb8e5f0d176c6ab40766a97afcaee89a0a9400a970aa92592b0b692b7a8e
-- 
cgit