aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 13:44:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-31 13:44:45 -0800
commit3dbc4f548519f9882676843b4fcdb4e61668baf8 (patch)
treec2d1dd097034bbfff7519f08836e3dd4ad7ac309 /security
parentMerge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff)
parentMerge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-seccomp (diff)
downloadlinux-dev-3dbc4f548519f9882676843b4fcdb4e61668baf8.tar.xz
linux-dev-3dbc4f548519f9882676843b4fcdb4e61668baf8.zip
Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions