Merge remote-tracking branch 'ext4/dev'

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

Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)

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

Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)
diff --cc fs/ext4/ialloc.c
Simple merge
diff --cc fs/ext4/verity.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 01:06:07 +0000 (11:06 +1000)
		1	2
fs/ext4/ialloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/verity.c	patch \|	diff1 \|	diff2 \|	blob \| history