From c840fdeb4a5c4e1565c41454115d441d30c1000b Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 16 Dec 2021 09:08:58 -0600
Subject: kernel-5.16-0.rc5.20211216git2b14864acbaa.37

* Thu Dec 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc5.20211216git2b14864acbaa.37]
- Enable CONFIG_BPF_SYSCALL for zfcpdump (Jiri Olsa)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver                  |  2 +-
 kernel-s390x-zfcpdump-rhel.config |  4 ++--
 kernel.spec                       | 15 +++++++++------
 sources                           |  6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 207954f23..7da488b72 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 = 36
+RHEL_RELEASE = 37
 
 #
 # Early y+1 numbering
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index ab837e9ec..be87d943e 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -6459,8 +6459,8 @@ CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PMEM_LEGACY=m
 CONFIG_X86_SGX_KVM=y
-CONFIG_XDP_SOCKETS_DIAG=y
-CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+# CONFIG_XDP_SOCKETS is not set
 # CONFIG_XEN_BACKEND is not set
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 CONFIG_XEN_PRIVCMD=m
diff --git a/kernel.spec b/kernel.spec
index 313a46467..57f127f00 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.rc5.20211214git5472f14a3742.36
+%global distro_build 0.rc5.20211216git2b14864acbaa.37
 
 %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.rc5.20211214git5472f14a3742.36
+%define pkgrelease 0.rc5.20211216git2b14864acbaa.37
 
 # This is needed to do merge window version magic
 %define patchlevel 16
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20211214git5472f14a3742.36%{?buildid}%{?dist}
+%define specrelease 0.rc5.20211216git2b14864acbaa.37%{?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-rc5-10-g5472f14a3742.tar.xz
+Source0: linux-5.16-rc5-25-g2b14864acbaa.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1383,8 +1383,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16-rc5-10-g5472f14a3742 -c
-mv linux-5.16-rc5-10-g5472f14a3742 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc5-25-g2b14864acbaa -c
+mv linux-5.16-rc5-25-g2b14864acbaa linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2981,6 +2981,9 @@ fi
 #
 #
 %changelog
+* Thu Dec 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc5.20211216git2b14864acbaa.37]
+- Enable CONFIG_BPF_SYSCALL for zfcpdump (Jiri Olsa)
+
 * Tue Dec 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc5.20211214git5472f14a3742.36]
 - Enable CONFIG_CIFS_SMB_DIRECT for ARK (Ronnie Sahlberg)
 - mt76: enable new device MT7921E in CentOs/RHEL (Íñigo Huguet) [2004821]
diff --git a/sources b/sources
index 3504aeac3..c4c238524 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc5-10-g5472f14a3742.tar.xz) = 98d630ac8b1f8093c5b108946651cb970d97b77af8ea19ce1b1b936c37d8627e18d01f7b964e5f01f70b71ebf46707d520bc9c50415a41ee4dcf04dc0be249ba
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc5.20211214git5472f14a3742.36.tar.bz2) = e18a3d7dbb6e339f13ac191f1d96edcf1fd690bab154803e39d5a835e4ab58d612492b2f37d873b510f766a76a915265f44e088c93ee5f9a60a2149e58c98c9c
-SHA512 (kernel-kabi-dw-5.16.0-0.rc5.20211214git5472f14a3742.36.tar.bz2) = 699bd0cefd1df656eebba0f8d297fa4020e159c2d1e3c7cd7e570755ad1db4fc09bbaba504b4b440262e0f8490e41f1cc366d9abc034a230244556aa3beed89b
+SHA512 (linux-5.16-rc5-25-g2b14864acbaa.tar.xz) = 2329250a45ee80eb096e7197f516a85bcaf7377797f4c317e9156a6e465be77f646bd53584764aaa18492d312ff585f3e1d833a29c626e216f4b0087f210d884
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc5.20211216git2b14864acbaa.37.tar.bz2) = 56f9d3f887b985994539c568d3ff6d0a785cefa9b00895aab4f0e9b96be4540516922dbeadf01679e03c1ac34b3e0504ef3006ede7880b96f639e325ab0790e0
+SHA512 (kernel-kabi-dw-5.16.0-0.rc5.20211216git2b14864acbaa.37.tar.bz2) = 7881d12d5d3d3661b0f8f7b1071d46b6146987a938483ee587caaa7c71bda5ea36f3382fab255f7eaa89c20574520c2f3b313ca52ef0890d7c256575fc731cfc
-- 
cgit