diff options
| author | Al Viro <[email protected]> | 2016-05-17 06:17:59 +0000 |
|---|---|---|
| committer | Al Viro <[email protected]> | 2016-05-17 06:17:59 +0000 |
| commit | 0e0162bb8c008fa7742f69d4d4982c8a37b88f95 (patch) | |
| tree | 4b230ab63b5698a44d2948e70a6cc22405c351e9 /security/selinux/hooks.c | |
| parent | ext4: switch to ->iterate_shared() (diff) | |
| parent | ovl: ignore permissions on underlying lookup (diff) | |
| download | kernel-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.tar.gz kernel-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.zip | |
Merge branch 'ovl-fixes' into for-linus
Backmerge to resolve a conflict in ovl_lookup_real();
"ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
but it was too late in the cycle to rebase.
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions