| commit | f3afe530d644488a074291da04a69a296ab63046 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 27 14:02:39 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 27 14:02:39 2018 -0800 |
| tree | 1d4ae11a9ecbc9f65aba2f98a6ef2ba215298af4 | |
| parent | b3d962605c0f552c72f7a8f62548227700f77ae8 [diff] | |
| parent | 757744eb5f47c4492dfc04155c2c2c325fbcb4fc [diff] |
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