diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-03 11:00:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-03 11:00:53 -0700 |
| commit | 665aadc1d69e6f98c01194531fa558224545ce22 (patch) | |
| tree | 9e5401425920f429f2da1b3826ee4bfb53c88591 /fs/ceph/caps.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | Adding YAMA hooks also when YAMA is not stacked. (diff) | |
| download | linux-dev-665aadc1d69e6f98c01194531fa558224545ce22.tar.xz linux-dev-665aadc1d69e6f98c01194531fa558224545ce22.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fix from James Morris:
"Yama initialization fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Adding YAMA hooks also when YAMA is not stacked.
Diffstat (limited to 'fs/ceph/caps.c')
0 files changed, 0 insertions, 0 deletions