projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae0cb7b 26025bf)
Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Jan 2018 21:44:45 +0000 (13:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Jan 2018 21:44:45 +0000 (13:44 -0800)
Pull seccomp updates from James Morris:
 "Add support for retrieving seccomp metadata"

* 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ptrace, seccomp: add support for retrieving seccomp metadata
  seccomp: hoist out filter resolving logic

1  2 
kernel/ptrace.c patch | diff1 | diff2 | blob | history
kernel/seccomp.c patch | diff1 | diff2 | blob | history

diff --cc kernel/ptrace.c
Simple merge
diff --cc kernel/seccomp.c
Simple merge
Domain: System / Kernel;