kernel-6.0.15-200

* Wed Dec 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.15-0]
- ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags (Al Viro)
- Linux v6.0.15
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

4 files changed, 28 insertions, 35 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index e488617b1..6c7dad931 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/84058f1267c7936e75e1374ec6eb34cae172d573
+ 84058f1267c7936e75e1374ec6eb34cae172d573 ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/c4246557e987f942c11afdafc40847b539aaa3ca
  c4246557e987f942c11afdafc40847b539aaa3ca drm/i915: fix TLB invalidation for Gen12 video and compute engines
 
diff --git a/kernel.spec b/kernel.spec
index c4dca1cad..5e0937ca3 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.14
+%define specversion 6.0.15
 %define patchversion 6.0
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.0.14
+%define tarfile_release 6.0.15
 # 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.14
+%define kabiversion 6.0.15
 
 # 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
+* Wed Dec 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.15-0]
+- ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags (Al Viro)
+- Linux v6.0.15
+
 * Mon Dec 19 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.14-0]
 - Remove F35 from release_targets due to EOL (Justin M. Forbes)
 - Linux v6.0.14
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index 092b2da60..d2091440f 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -29,6 +29,7 @@
  drivers/pci/pcie/ptm.c                             | 300 ++++++++++++---------
  drivers/pci/quirks.c                               |  24 ++
  drivers/usb/core/hub.c                             |   7 +
+ fs/overlayfs/file.c                                |   1 +
  include/linux/efi.h                                |  22 +-
  include/linux/lsm_hook_defs.h                      |   2 +
  include/linux/lsm_hooks.h                          |   6 +
@@ -45,10 +46,10 @@
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 47 files changed, 767 insertions(+), 365 deletions(-)
+ 48 files changed, 768 insertions(+), 365 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index a3c02b45fb57..97c8cb2941db 100644
+index 0c7ae314ad3d..70073286d29f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1786,6 +1787,18 @@ index bbab424b0d55..ed86042fb57b 100644
  	/* Lock the device, then check to see if we were
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
+diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
+index daff601b5c41..6268eccfa69d 100644
+--- a/fs/overlayfs/file.c
++++ b/fs/overlayfs/file.c
+@@ -96,6 +96,7 @@ static int ovl_change_flags(struct file *file, unsigned int flags)
+
+ 	spin_lock(&file->f_lock);
+ 	file->f_flags = (file->f_flags & ~OVL_SETFL_MASK) | flags;
++	file->f_iocb_flags = iocb_flags(file);
+ 	spin_unlock(&file->f_lock);
+
+ 	return 0;
 diff --git a/include/linux/efi.h b/include/linux/efi.h
 index f87b2f5db9f8..0b156c2a4ab3 100644
 --- a/include/linux/efi.h
@@ -2160,30 +2173,3 @@ index 4b95de24bc8d..10047790e96e 100644
  #ifdef CONFIG_PERF_EVENTS
  int security_perf_event_open(struct perf_event_attr *attr, int type)
  {
-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 1ba38f0c7..715586b1d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0.14.tar.xz) = 2028f697caf789d6dfa81bc5dfe40d9ca967d65368df6cbcb42fbaf6078589c3c17cf10b4a899b799c139b5cdc0465ff4fdb249d15ef901ed0d872ad91c7499b
-SHA512 (kernel-abi-stablelists-6.0.14.tar.bz2) = 9ac31d14539abffed1d2ad46277a6beba0e960d83ffe41bc274367c452883184dba501cd67b299334661b7dc58ecd4b64ad2beeeb3114b40131c7fa914b75ca9
-SHA512 (kernel-kabi-dw-6.0.14.tar.bz2) = a0cc3a36e85db451596e2397c08dec84cc83f49201ac0c3e8aec5e008ac3d2162a3d2b577ea94e7a290bc931d270d6e9d2d55c445101612a7d1f2afe1e511341
+SHA512 (linux-6.0.15.tar.xz) = 9c8e30b7acdbd19cb2fad3f236949d0b2fe616c93f3d5930516e434b583598dd09c397ee7d7ad56c32edd90942800b0687e35afc6c6dee07f4ab11226e458213
+SHA512 (kernel-abi-stablelists-6.0.15.tar.bz2) = 9d349dfc87db23f9afcf22ed6c4d008efb0b792aa160be840702069aac94de831242a1a6d9e98cc4e2de111e27887ed2aacb5f166acb93fba11a45f4a35786d7
+SHA512 (kernel-kabi-dw-6.0.15.tar.bz2) = 37fe68479b8be9962791157863e2333877926afb953112cd6231e5261ee9c446953d822cd3934c0d920482c8405a5c271516d5fb2649d9353d8432dedc30fbe7