Merge branch 'ovl-fixes' into for-linus

author Al Viro <[email protected]>

Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)

committer Al Viro <[email protected]>

Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
author Al Viro <[email protected]>
Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
committer Al Viro <[email protected]>
Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
diff --cc fs/namei.c
Simple merge
diff --cc fs/splice.c
Simple merge
author	Al Viro <[email protected]>
	Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
committer	Al Viro <[email protected]>
	Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
		1	2
fs/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/splice.c	patch \|	diff1 \|	diff2 \|	blob \| history