diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-28 00:27:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-28 00:27:52 +0100 |
| commit | 7e4b9359f483fe270c176cc37aaad54d5d1b6a1c (patch) | |
| tree | 8e1606c2c90fb85ff1cae51a19b1cc2d41d0da87 /fs/btrfs/transaction.h | |
| parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into... (diff) | |
| download | linux-7e4b9359f483fe270c176cc37aaad54d5d1b6a1c.tar.xz linux-7e4b9359f483fe270c176cc37aaad54d5d1b6a1c.zip | |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fixes from James Morris:
"A fix for SELinux policy processing (regression introduced by
commit fa1aa143ac4a: "selinux: extended permissions for ioctls"), as
well as a fix for the user-triggerable oops in the Keys code"
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: Fix handling of stored error in a negatively instantiated user key
selinux: fix bug in conditional rules handling
Diffstat (limited to 'fs/btrfs/transaction.h')
0 files changed, 0 insertions, 0 deletions