On Tue, Jun 27, 2023 at 10:39:00AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the ext4 tree got a conflict in:
>
> fs/ext4/ioctl.c
>
> between commit:
>
> 97524b454bc5 ("ext4: split ext4_shutdown")
>
> from Linus' tree and commit:
>
> c4d13222afd8 ("ext4: fix to check return value of freeze_bdev() in ext4_shutdown()")
Hmm, I can't actually find the latter commit in linux-next and the context
below also doesn't make it obviously cler to me what the conflict was.
