git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b3d9626 757744e)
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)
commitf3afe530d644488a074291da04a69a296ab63046
tree1d4ae11a9ecbc9f65aba2f98a6ef2ba215298af4tree
parentb3d962605c0f552c72f7a8f62548227700f77ae8commit | diff
parent757744eb5f47c4492dfc04155c2c2c325fbcb4fccommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.