commit | 159d08f4b85ce454cd05fb9e2c539276e148d366 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 26 09:15:19 2016 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 26 09:15:19 2016 -0700 |
tree | 0825ebc348dcb983f6a3ccebf0216aac92690343 | |
parent | 2f7c3a18a2dc79ddf7b83ae199b099a675e1adb2 [diff] | |
parent | dca6b4149181baaa363b9a7ce7c550840bb3bc83 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull Yama locking fix from James Morris: "Fix for the Yama LSM" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Yama: fix double-spinlock and user access in atomic context