Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Feb 2017 02:08:50 +0000 (18:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Feb 2017 02:08:50 +0000 (18:08 -0800)
commitb4642c109f9bbf62b2ee10babf5c4221c48480aa
treee62e8f6132377c687517ffddd79bbf7c6ffb9010
parenta27fcb0cd1bcc812017192bdde41cc456dcd6afe
parentd7276e321ff8a53106a59c85ca46d03e34288893
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull seccomp fix from James Morris:
 "A fix for a regression in the seccomp code (it was supposed to be in
  the first pull req but I had it queued in the wrong branch)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  seccomp: Only dump core when single-threaded