Merge remote-tracking branch 'cifsd/cifsd-for-next'

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

Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)

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

Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)
diff --cc Documentation/filesystems/index.rst
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)
		1	2
Documentation/filesystems/index.rst	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history