Merge remote-tracking branch 'fscache/fscache-next'

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

Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)

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

Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)
diff --cc include/linux/fs.h
Simple merge
diff --cc mm/internal.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 00:22:43 +0000 (10:22 +1000)
		1	2
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history