summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SOURCES/patch-6.0-redhat.patch17
-rwxr-xr-xSPECS/kernel.spec13
2 files changed, 10 insertions, 20 deletions
diff --git a/SOURCES/patch-6.0-redhat.patch b/SOURCES/patch-6.0-redhat.patch
index 2a51076..53cb710 100644
--- a/SOURCES/patch-6.0-redhat.patch
+++ b/SOURCES/patch-6.0-redhat.patch
@@ -29,7 +29,6 @@
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 +
@@ -46,10 +45,10 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 48 files changed, 768 insertions(+), 367 deletions(-)
+ 47 files changed, 767 insertions(+), 367 deletions(-)
diff --git a/Makefile b/Makefile
-index ff8d88b11391..ff74e2bc5668 100644
+index a0ddac5b7caf..4928c29f049a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1789,18 +1788,6 @@ 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 a34f8042724c..172cde9d2e56 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 22200de..19c4bbe 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.16
+%define specversion 6.0.17
%define patchversion 6.0
%define pkgrelease 300
%define kversion 6
-%define tarfile_release 6.0.16
+%define tarfile_release 6.0.17
# 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.16
+%define kabiversion 6.0.17
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -3221,8 +3221,11 @@ fi
#
#
%changelog
-* Mon Jan 02 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.0.16-301.fsync
-- kernel-fsync v6.0.16
+* Sun Jan 08 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.0.17-301.fsync
+- kernel-fsync v6.0.17
+
+* Wed Jan 04 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.17-0]
+- Linux v6.0.17
* Sat Dec 31 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.16-0]
- Linux v6.0.16