projects
/
linux
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b3d9626
757744e
)
Merge branch 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 27 Feb 2018 22:02:39 +0000
(14:02 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 27 Feb 2018 22:02:39 +0000
(14:02 -0800)
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
Trivial merge