diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch | |
parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
download | kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.gz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.xz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
Diffstat (limited to '0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch')
-rw-r--r-- | 0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch index fc6b78ad0..0e0717050 100644 --- a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch +++ b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch @@ -30,7 +30,7 @@ index 5616b2567aa7..bc5caab1413b 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h -index 988ca0df7824..4ed37b95417c 100644 +index 44d5422c18e4..e8c9797994df 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -1476,6 +1476,12 @@ |