From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Sep 2016 17:46:06 +0000 (-0700)
Subject: Merge tag 'seccomp-v4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v6.1~15872
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab29b33a84f6910ebf01a32f69a370886a4283dd;p=sdk%2Femulator%2Femulator-kernel.git

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
---

ab29b33a84f6910ebf01a32f69a370886a4283dd