Merge remote-tracking branch 'ext3/for_next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 9 Dec 2018 23:33:07 +0000 (10:33 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 9 Dec 2018 23:33:07 +0000 (10:33 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:33:07 +0000 (10:33 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:33:07 +0000 (10:33 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/Makefile
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 9 Dec 2018 23:33:07 +0000 (10:33 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 9 Dec 2018 23:33:07 +0000 (10:33 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history