diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-18 09:25:06 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-18 09:25:06 +0200 |
| commit | ef6c97844c888a0ad81b11718c2272c202c15ab6 (patch) | |
| tree | 912d58039357a194a97c51fcb281ae4c30f5bf0f /patch-5.13-redhat.patch | |
| parent | ca3b76a821a2e537dd7b82074e671aba980c7cd7 (diff) | |
| parent | d7687b4cdb794e2992ad71cef3ce84d2207aad19 (diff) | |
| download | kernel-ef6c97844c888a0ad81b11718c2272c202c15ab6.tar.gz kernel-ef6c97844c888a0ad81b11718c2272c202c15ab6.tar.xz kernel-ef6c97844c888a0ad81b11718c2272c202c15ab6.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.13-redhat.patch')
| -rw-r--r-- | patch-5.13-redhat.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index 2e1778e8b..d25c40da5 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -99,7 +99,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index 4e9f877f513f..6123e12d63e2 100644 +index eaf1df54ad12..96c289777a99 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -2126,10 +2126,10 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 06f7c50ce77f..09ed686ac5e6 100644 +index 0acd1b68bf30..a02717d46d6d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -471,6 +471,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); +@@ -472,6 +472,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); @@ -2137,7 +2137,7 @@ index 06f7c50ce77f..09ed686ac5e6 100644 #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1347,6 +1348,10 @@ static inline int security_locked_down(enum lockdown_reason what) +@@ -1348,6 +1349,10 @@ static inline int security_locked_down(enum lockdown_reason what) { return 0; } @@ -2323,10 +2323,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index b38155b2de83..b0a6711b4825 100644 +index 0d626c0dafcc..61696b1f5d3f 100644 --- a/security/security.c +++ b/security/security.c -@@ -2598,6 +2598,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2599,6 +2599,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); |