summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2023-01-04 09:46:33 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2023-01-04 09:46:33 -0600
commita8a4a0bf7c508832d5f4a81c2c6bb9fa4c713cad (patch)
treeac8e0fe8c8d75cfd73f326c3c34ec68619836110
parent1e466e83f3addc8f3c3b9c59e191d8545466807c (diff)
downloadkernel-a8a4a0bf7c508832d5f4a81c2c6bb9fa4c713cad.tar.gz
kernel-a8a4a0bf7c508832d5f4a81c2c6bb9fa4c713cad.tar.xz
kernel-a8a4a0bf7c508832d5f4a81c2c6bb9fa4c713cad.zip
kernel-6.1.3-200
* Wed Jan 04 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.3-0] - Linux v6.1.3 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rwxr-xr-xkernel.spec9
-rw-r--r--patch-6.1-redhat.patch17
-rw-r--r--sources6
3 files changed, 11 insertions, 21 deletions
diff --git a/kernel.spec b/kernel.spec
index 6b391a303..39c5162fb 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,17 +124,17 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
-%define specversion 6.1.2
+%define specversion 6.1.3
%define patchversion 6.1
%define pkgrelease 200
%define kversion 6
-%define tarfile_release 6.1.2
+%define tarfile_release 6.1.3
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 200%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.1.2
+%define kabiversion 6.1.3
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -3178,6 +3178,9 @@ fi
#
#
%changelog
+* Wed Jan 04 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.3-0]
+- Linux v6.1.3
+
* Sat Dec 31 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.2-0]
- Configs fix up for 6.1.2 (Justin M. Forbes)
- disable enum64 BTF in fedora rawhide (Jiri Olsa)
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index 9379fee81..5c3b027e8 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -20,7 +20,6 @@
drivers/iommu/iommu.c | 22 ++++
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 +
@@ -34,10 +33,10 @@
security/lockdown/Kconfig | 13 +++
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 36 files changed, 453 insertions(+), 177 deletions(-)
+ 35 files changed, 452 insertions(+), 177 deletions(-)
diff --git a/Makefile b/Makefile
-index 2ecc568c779f..85b3b34336dd 100644
+index a69d14983a48..ddaa7fccb596 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -993,18 +992,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 d066be3b9226..6011f955436b 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 7603fc58c47c..1099e99286c6 100644
--- a/include/linux/efi.h
diff --git a/sources b/sources
index d4e48f265..329b9ee0f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
-SHA512 (linux-6.1.2.tar.xz) = 4a8503ad00b1077e67efa04c5050d14ba405b20adab561ebf8813ff51323721c404f80a8ca058cc04277ef96a33bd1cd544e1cda6184c5e538e1e785586ab683
-SHA512 (kernel-abi-stablelists-6.1.2.tar.bz2) = dc72c5973f9348a553e3188b8d96493a3e8ce4cfb556a1ae181b9479cc3e3a6b950ea98890b1383992cf4e62b54c7cc5fcde6ba70f1847ad695a6a3df88fce43
-SHA512 (kernel-kabi-dw-6.1.2.tar.bz2) = 08c73581b9b83c1af371d6326b1e7e4924d888c4df6ccb6cfb94cd3921d85e9f879ca63a6051e019a98742912aee7ea7bb2c332cfa510ffd02997bdf714f8184
+SHA512 (linux-6.1.3.tar.xz) = 0b910cb612e193d059739f8145f3ef0a24c3b9bd29532cd9b5b1eaab90fc387398e5fb3eca101a579f87c6350886f1d4bca60f31144804ab10b1612b67b40fdc
+SHA512 (kernel-abi-stablelists-6.1.3.tar.bz2) = 4a99b5b4c494d8b58e3c2c7ae7fc617c9f8fe40427ca3203e17484eaef3c061da236aa1e08361a17abb9f9defa9b0814c1741b7fd8d8c027dcbde1be94b3ff2e
+SHA512 (kernel-kabi-dw-6.1.3.tar.bz2) = cd99b00300b0957b913371e0172d382d13f729df8a54f2961a189aa5c599893895e477cbbbf39d7e1cb6e5ee8920e48dd827186828a4a00e65be84c663adc6ee