From a9e9670a326cca75ad163449a1e3c7c9ccdb8dd5 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 3 Nov 2022 11:41:03 -0500
Subject: kernel-6.0.7-200

* Thu Nov 03 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.7-0]
- Add revert patch for BTF workaround (Justin M. Forbes)
- Linux v6.0.7
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel.spec            | 10 +++++++---
 patch-6.0-redhat.patch | 29 ++++++++++++++++++++++++++++-
 sources                |  6 +++---
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index d6d657af6..aaefe187b 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -122,17 +122,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specversion 6.0.6
+%define specversion 6.0.7
 %define patchversion 6.0
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.0.6
+%define tarfile_release 6.0.7
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 200%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.0.6
+%define kabiversion 6.0.7
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3180,6 +3180,10 @@ fi
 #
 #
 %changelog
+* Thu Nov 03 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.7-0]
+- Add revert patch for BTF workaround (Justin M. Forbes)
+- Linux v6.0.7
+
 * Tue Nov 01 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.6-0]
 - drm/simpledrm: Only advertise formats that are supported (Justin M. Forbes)
 - disable enum64 BTF in fedora rawhide (Jiri Olsa)
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index aa4faf1ed..d780947ee 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -45,7 +45,7 @@
  44 files changed, 609 insertions(+), 199 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index e6c10009d413..e9fc5ea8e350 100644
+index c2144a4bb2ef..4e8ae58e2ec1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1682,3 +1682,30 @@ index d5a0dd548989..ee5e98204d3d 100755
  }
 
  ipv4_grp_fcnal()
+From 90c4bd0059367922f88768784bfb7c5ec1bc846c Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Thu, 3 Nov 2022 11:34:03 -0500
+Subject: [PATCH] Revert "disable enum64 BTF in fedora rawhide"
+
+This option is not supported by older pahole versions.
+
+This reverts commit 7ab8e0d8b46b7f768e37f8ff39ccae2ecc897396.
+---
+ scripts/pahole-flags.sh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
+index 81c8e082ec57..0d99ef17e4a5 100755
+--- a/scripts/pahole-flags.sh
++++ b/scripts/pahole-flags.sh
+@@ -20,7 +20,4 @@ if [ "${pahole_ver}" -ge "122" ]; then
+ 	extra_paholeopt="${extra_paholeopt} -j"
+ fi
+
+-# temporary workaround to disable enum64
+-extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
+-
+ echo ${extra_paholeopt}
+-- 
+2.37.3
+
diff --git a/sources b/sources
index 7958babb3..0597d7cfb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0.6.tar.xz) = 58f511b55b198c976418c2fa790b1b6a7f217f3474d1cafdb8ed6500a6080689cdc76a1c143be90b2c7efea3af463076bb4cfa1c75acd708b7a671cf2a5c5e6a
-SHA512 (kernel-abi-stablelists-6.0.6.tar.bz2) = 04cb5d0b9595a45da7e39e1c5bcdb05f09a10fc474640f6fe06b9fcef08a61ee1db02c94f5441a7f17c2ce5f9bbd0c18fe506ba2c285a5d9433ebec35ab77576
-SHA512 (kernel-kabi-dw-6.0.6.tar.bz2) = 5a3c76bc07b52d70e14707efa1b54b6614c1dcf4915238cc08c3d186b65bce9955699a45f8ffb6c9b844344d525d584c658b790a75a073ca0358b6947469a627
+SHA512 (linux-6.0.7.tar.xz) = a7b298fbf3ff5bf759755589748b16428fdf35225013709eeb645bd09368937ed4f7f6c23c70cdfa077e8d20cffa2ee4fbb24e4e3023bafcb46c845aeeaff19e
+SHA512 (kernel-abi-stablelists-6.0.7.tar.bz2) = ac411ab1976e636645e07f0e54a41b268820c27067b51de9ad881f57ef3ea31caf4dd96623d38a56a820282577906816e3c740087961982754d49022b0bafcaf
+SHA512 (kernel-kabi-dw-6.0.7.tar.bz2) = 5aa98ec0bc19d220383ea9d869254b8d998bd7a591206079d254a5249c0d3e7c17391cbe7e4789d63003ee2e2b971ab40255f38b9404462012d17421bd1eb7a4
-- 
cgit