diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 22:44:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 22:44:45 +0100 |
commit | 3dbc4f548519f9882676843b4fcdb4e61668baf8 (patch) | |
tree | c2d1dd097034bbfff7519f08836e3dd4ad7ac309 /security/selinux/ss | |
parent | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor... (diff) | |
parent | Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/k... (diff) | |
download | linux-3dbc4f548519f9882676843b4fcdb4e61668baf8.tar.xz linux-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/selinux/ss')
0 files changed, 0 insertions, 0 deletions