From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Feb 2018 22:02:39 +0000 (-0800)
Subject: Merge branch 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f3afe530d644488a074291da04a69a296ab63046;p=linux.git

Merge branch 'fixes-v4.16-rc4' of git://git./linux/kernel/git/jmorris/linux-security

Pull seccomp fix from James Morris:
 "This disables the seccomp samples when cross compiling.

  We've seen too many build issues here, so it's best to just disable
  it, especially since they're just the samples"

* 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  samples/seccomp: do not compile when cross compiled
---

f3afe530d644488a074291da04a69a296ab63046