diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 15:49:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 15:49:51 -0700 |
| commit | a16298439bd5469d89ec0e575e1c26e7b9a8178a (patch) | |
| tree | 89700940f432aa893565fa8bc0940159a6aeaaf3 /include/linux/security.h | |
| parent | b3aa112d57b704441143d84b0475fb633a750035 (diff) | |
| parent | 3e27a33932df104f4f9ff811467b0b4ccebde773 (diff) | |
Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris:
"Two minor updates for the core security subsystem:
- kernel-doc warning fixes from Randy Dunlap
- header cleanup from YueHaibing"
* 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security:
security: remove duplicated include from security.h
security: <linux/lsm_hooks.h>: fix all kernel-doc warnings
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 64b19f050343..a8d9310472df 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -30,7 +30,6 @@ #include <linux/err.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/fs.h> struct linux_binprm; struct cred; |