diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 03:08:50 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 03:08:50 +0100 |
commit | b4642c109f9bbf62b2ee10babf5c4221c48480aa (patch) | |
tree | e62e8f6132377c687517ffddd79bbf7c6ffb9010 /drivers/irqchip/irq-sirfsoc.c | |
parent | Merge tag 'xfs-4.11-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
parent | seccomp: Only dump core when single-threaded (diff) | |
download | linux-b4642c109f9bbf62b2ee10babf5c4221c48480aa.tar.xz linux-b4642c109f9bbf62b2ee10babf5c4221c48480aa.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/irqchip/irq-sirfsoc.c')
0 files changed, 0 insertions, 0 deletions