lkml.org 
[lkml]   [2023]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the ext4 tree with Linus' tree
Hi Christoph,

On Tue, 27 Jun 2023 08:37:53 +0200 Christoph Hellwig <hch@lst.de> 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2023-06-27 09:28    [W:0.166 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site