From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Mar 2020 22:49:51 +0000 (-0700)
Subject: Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.15~4206
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a16298439bd5469d89ec0e575e1c26e7b9a8178a;p=platform%2Fkernel%2Flinux-starfive.git

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
---

a16298439bd5469d89ec0e575e1c26e7b9a8178a