]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ovl-fixes' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 17 May 2016 06:17:59 +0000 (02:17 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 17 May 2016 06:17:59 +0000 (02:17 -0400)
commitdf0ed3cb5e30a81c2bdfe3ccddaed2af668348a5
tree4b230ab63b5698a44d2948e70a6cc22405c351e9
parent3477cd7d491ba2bed1d7214db0f271a60b8bc652
parent2fe13ba86bb59d03c885d28c0686cf30a5dac0ce
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.
fs/namei.c
fs/open.c
fs/overlayfs/super.c
fs/proc/base.c
include/linux/dcache.h