]> 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)
commitc906f7ce8d4b4868a77be7976686394076f9f33c
tree4b230ab63b5698a44d2948e70a6cc22405c351e9
parent6e808dcc83d69a3df50f8e4c015ede734f54fb9d
parent8d35f290fcdba8e7d1b682299d0c80999934a3ba
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