diff options
Diffstat (limited to 'patch-6.0-redhat.patch')
| -rw-r--r-- | patch-6.0-redhat.patch | 17 |
1 files changed, 2 insertions, 15 deletions
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 |