From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Dec 2016 18:03:52 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.15~12185
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67327145c4af673d9c4ef06537ca8c5818f97668;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull SElinux fix from James Morris:
 "From Paul:
   'A small SELinux patch to fix some clang/llvm compiler warnings and
    ensure the tools under scripts work well in the face of kernel
    changes'"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: use the kernel headers when building scripts/selinux
---

67327145c4af673d9c4ef06537ca8c5818f97668