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

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

Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)

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

Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)
diff --cc fs/gfs2/file.c
Simple merge
diff --cc fs/gfs2/glops.c
Simple merge
diff --cc fs/gfs2/inode.c
Simple merge
diff --cc fs/gfs2/inode.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:05:44 +0000 (13:05 +1000)
		1	2
fs/gfs2/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/gfs2/glops.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.h	patch \|	diff1 \|	diff2 \|	blob \| history