From 5ae7d8cc82f0b259f789726040485efe0ad6a699 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 4 Jan 2023 09:32:53 -0600
Subject: kernel-6.0.17-200

* Wed Jan 04 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.17-0]
- Linux v6.0.17
Resolves:

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

diff --git a/kernel.spec b/kernel.spec
index 24c761228..e394b01ad 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.16
+%define specversion 6.0.17
 %define patchversion 6.0
 %define pkgrelease 200
 %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 200%{?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
@@ -3180,6 +3180,9 @@ fi
 #
 #
 %changelog
+* 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
 
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index cb447b5f2..7b9dc7836 100644
--- a/patch-6.0-redhat.patch
+++ b/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/sources b/sources
index 2afa2f0ca..8b9a40986 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0.16.tar.xz) = 4528b503dd6b2c4a357e4c9a2fb51a7972428e78a94a0a85a3bc01ad56f42ee9b969dddaa72ed626e03230ea02a5df56f81272d0f3fbfaf2f3b09916d960381b
-SHA512 (kernel-abi-stablelists-6.0.16.tar.bz2) = 9f16816a80e515c71af5bb36dfec5200454b7af04ee3d4aa5beefe05f8ba80f1bce58ef9c550343f65d33d06a951da3f69ad7ddd1fe3ae13559f26b105d84145
-SHA512 (kernel-kabi-dw-6.0.16.tar.bz2) = 08c73581b9b83c1af371d6326b1e7e4924d888c4df6ccb6cfb94cd3921d85e9f879ca63a6051e019a98742912aee7ea7bb2c332cfa510ffd02997bdf714f8184
+SHA512 (linux-6.0.17.tar.xz) = 3b7bd3725f0f0c7c6ecfd475bc5f1a3752e05037d6ad303aa6e26dec583d8c651820c60ef1b776bfd3870ecded474386414d08602693f51e6f19e384c717e7b1
+SHA512 (kernel-abi-stablelists-6.0.17.tar.bz2) = 39e80ecc1caeda2e3b05b4c8b54044ec161f2847131cf7123dd125f856bf795676b88417df685b123a80004384f99a460ba2c8e634b6817cd3b22893120d3548
+SHA512 (kernel-kabi-dw-6.0.17.tar.bz2) = cd99b00300b0957b913371e0172d382d13f729df8a54f2961a189aa5c599893895e477cbbbf39d7e1cb6e5ee8920e48dd827186828a4a00e65be84c663adc6ee
-- 
cgit