diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 13:44:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 13:44:45 -0800 |
| commit | d916548fd6e6f2ea16e4a2f7c7ae1f2ce4acf8f4 (patch) | |
| tree | 68db963fa92502b16dd67dabde87b20485fefe34 /crypto/salsa20_generic.c | |
| parent | 2478feb28d2dd97e6762278cf9138ef987b0df29 (diff) | |
| parent | a43a1243adfa8cc682fd4dacab89910865c28031 (diff) | |
| download | linux-crypto-d916548fd6e6f2ea16e4a2f7c7ae1f2ce4acf8f4.tar.gz linux-crypto-d916548fd6e6f2ea16e4a2f7c7ae1f2ce4acf8f4.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 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions