Merge branch 'for-viro' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

author Al Viro <viro@zeniv.linux.org.uk>

Wed, 3 Aug 2016 17:31:51 +0000 (13:31 -0400)

committer Al Viro <viro@zeniv.linux.org.uk>

Wed, 3 Aug 2016 17:31:51 +0000 (13:31 -0400)
author Al Viro <viro@zeniv.linux.org.uk>
Wed, 3 Aug 2016 17:31:51 +0000 (13:31 -0400)
committer Al Viro <viro@zeniv.linux.org.uk>
Wed, 3 Aug 2016 17:31:51 +0000 (13:31 -0400)
diff --cc fs/inode.c
Simple merge
diff --cc fs/internal.h
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Wed, 3 Aug 2016 17:31:51 +0000 (13:31 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Wed, 3 Aug 2016 17:31:51 +0000 (13:31 -0400)
		1	2
fs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history