Merge tag 'seccomp-v4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2016 17:46:06 +0000 (10:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2016 17:46:06 +0000 (10:46 -0700)
commitab29b33a84f6910ebf01a32f69a370886a4283dd
tree13456cc951d245346c8339264bf81c289c2121e9
parent08411a7554248009f26e85635f445a209604bfb5
parent4fadd04d504a82f7f1fdeaddc144a9c396d1285e
Merge tag 'seccomp-v4.8-rc6' of git://git./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