diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-02 18:48:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-02 18:48:13 +0100 |
| commit | d9a7fa67b4bfe6ce93ee9aab23ae2e7ca0763e84 (patch) | |
| tree | ea15c22c088160107c09da1c8d380753bb0c8d21 /mm/page_io.c | |
| parent | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge tag 'seccomp-next-part2' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-d9a7fa67b4bfe6ce93ee9aab23ae2e7ca0763e84.tar.xz linux-d9a7fa67b4bfe6ce93ee9aab23ae2e7ca0763e84.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 SECCOMP_RET_USER_NOTIF
- seccomp fixes for sparse warnings and s390 build (Tycho)
* 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
seccomp, s390: fix build for syscall type change
seccomp: fix poor type promotion
samples: add an example of seccomp user trap
seccomp: add a return code to trap to userspace
seccomp: switch system call argument type to void *
seccomp: hoist struct seccomp_data recalculation higher
Diffstat (limited to 'mm/page_io.c')
0 files changed, 0 insertions, 0 deletions