Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Mar 2020 22:49:51 +0000 (15:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Mar 2020 22:49:51 +0000 (15:49 -0700)
commita16298439bd5469d89ec0e575e1c26e7b9a8178a
tree89700940f432aa893565fa8bc0940159a6aeaaf3
parentb3aa112d57b704441143d84b0475fb633a750035
parent3e27a33932df104f4f9ff811467b0b4ccebde773
Merge branch 'next-general' of git://git./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
include/linux/lsm_hooks.h
include/linux/security.h