Hi Christoph,
On Tue, 27 Jun 2023 08:37:53 +0200 Christoph Hellwig <hch@xxxxxx> wrote:
>
> 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.
That is probably because today's tree had not been released yet ..
please refetch and try again.
--
Cheers,
Stephen Rothwell
Attachment:
pgpS2qq6aAixN.pgp
Description: OpenPGP digital signature
