| commit | ab29b33a84f6910ebf01a32f69a370886a4283dd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 07 10:46:06 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 07 10:46:06 2016 -0700 |
| tree | 13456cc951d245346c8339264bf81c289c2121e9 | |
| parent | 08411a7554248009f26e85635f445a209604bfb5 [diff] | |
| parent | 4fadd04d504a82f7f1fdeaddc144a9c396d1285e [diff] |
Merge tag 'seccomp-v4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Pull seccomp fixes from Kees Cook: "Fix UM seccomp vs ptrace, after reordering landed" * tag 'seccomp-v4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: seccomp: Remove 2-phase API documentation um/ptrace: Fix the syscall number update after a ptrace um/ptrace: Fix the syscall_trace_leave call