git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ae05327 38b78a5)

author	Al Viro <viro@zeniv.linux.org.uk>
	Tue, 17 May 2016 06:17:59 +0000 (02:17 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Tue, 17 May 2016 06:17:59 +0000 (02:17 -0400)
commit	0e0162bb8c008fa7742f69d4d4982c8a37b88f95
tree	4b230ab63b5698a44d2948e70a6cc22405c351e9	tree \| snapshot
parent	ae05327a00fd47c34dfe25294b359a3f3fef96e8	commit \| diff
parent	38b78a5f18584db6fa7441e0f4531b283b0e6725	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
fs/open.c	diff1 \|	diff2 \|	blob \| history
fs/overlayfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
include/linux/dcache.h	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)