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)
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.

1  2 
fs/namei.c
fs/open.c
fs/overlayfs/super.c
fs/proc/base.c
include/linux/dcache.h

diff --cc fs/namei.c
Simple merge
diff --cc fs/open.c
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge