]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Feb 2018 22:02:39 +0000 (14:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Feb 2018 22:02:39 +0000 (14:02 -0800)
commit2500f783709202cbe3485290a4d2b92bce7b39c3
tree1d4ae11a9ecbc9f65aba2f98a6ef2ba215298af4
parentf86c79a82cc1ba4078678b9058c216cfdb3e501a
parent2411ff36294b5100ee994aae2e44375fd1098c08
Merge branch 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/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