summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SOURCES/Patchlist.changelog3
-rw-r--r--SOURCES/patch-6.0-redhat.patch17
-rwxr-xr-xSPECS/kernel.spec14
3 files changed, 27 insertions, 7 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index e488617..6c7dad9 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/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/SOURCES/patch-6.0-redhat.patch b/SOURCES/patch-6.0-redhat.patch
index 3f9a172..d209144 100644
--- a/SOURCES/patch-6.0-redhat.patch
+++ b/SOURCES/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
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 4593abb..267d552 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -122,17 +122,17 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
%define buildid .fsync
-%define specversion 6.0.14
+%define specversion 6.0.15
%define patchversion 6.0
%define pkgrelease 300
%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 301%{?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
@@ -3221,8 +3221,12 @@ fi
#
#
%changelog
-* Thu Dec 22 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 6.0.14-301.fsync
-- kernel-fsync v6.0.14
+* Thu Dec 22 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 6.0.15-301.fsync
+- kernel-fsync v6.0.15
+
+* 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)