diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-07 12:59:55 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2023-01-07 12:59:55 +0100 |
| commit | d318d27d4b9d30382700b35e044e8477ba11f1fd (patch) | |
| tree | b4ba9117ebe4259ad2c6be65bc2b26e10b0fc4ed | |
| parent | 5c3d05923ab4c0134b0c8c535798e8103f92a9d1 (diff) | |
| parent | d77e59c9601e2e7a1aa4c7eb77a237a8b45241ab (diff) | |
| download | kernel-d318d27d4b9d30382700b35e044e8477ba11f1fd.tar.gz kernel-d318d27d4b9d30382700b35e044e8477ba11f1fd.tar.xz kernel-d318d27d4b9d30382700b35e044e8477ba11f1fd.zip | |
Merge remote-tracking branch 'origin/f37' into f37-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 5 | ||||
| -rw-r--r-- | patch-6.0-redhat.patch | 17 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 9 insertions, 19 deletions
diff --git a/kernel.spec b/kernel.spec index 3ab3d329d..2f5e2e320 100755 --- a/kernel.spec +++ b/kernel.spec @@ -136,7 +136,7 @@ Summary: The Linux kernel # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 350%{?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 @@ -3186,6 +3186,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 2a51076e4..53cb7102a 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 @@ -1,3 +1,3 @@ -SHA512 (linux-6.0.16.tar.xz) = 4528b503dd6b2c4a357e4c9a2fb51a7972428e78a94a0a85a3bc01ad56f42ee9b969dddaa72ed626e03230ea02a5df56f81272d0f3fbfaf2f3b09916d960381b -SHA512 (kernel-abi-stablelists-6.0.16.tar.bz2) = b74c5733d9323c3c7227c2759798cbc9110814e53af7f2d957fc6e06c67ca5f6313dbae91140157e963cda0005c7971d4f5f64f7cbcce9e07cf1469867ad23c7 -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) = 699a21720eeaef7fc7ac13f10c8e3beb26d15d5452170813d5b468e53c4327029498755b300c76b4029746d1f9ad45591a7235a795b55f3d9052b721dd9aee53 +SHA512 (kernel-kabi-dw-6.0.17.tar.bz2) = cd99b00300b0957b913371e0172d382d13f729df8a54f2961a189aa5c599893895e477cbbbf39d7e1cb6e5ee8920e48dd827186828a4a00e65be84c663adc6ee |