[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240508064700.GB10736@lst.de>
Date: Wed, 8 May 2024 08:47:00 +0200
From: Christoph Hellwig <hch@....de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Christian Brauner <brauner@...nel.org>, Theodore Ts'o <tytso@....edu>,
Christoph Hellwig <hch@....de>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
"Ritesh Harjani (IBM)" <ritesh.list@...il.com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the ext4
tree
On Wed, May 08, 2024 at 10:34:36AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/ext4/file.c
>
> between commit:
>
> a0c7cce824a5 ("ext4: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method")
>
> from the ext4 tree and commit:
>
> 210a03c9d51a ("fs: claw back a few FMODE_* bits")
>
> from the vfs-brauner tree.
Ted, if you still can maybe just drop the ext4 patch for now? I can
redo it for next merge window with the moved flag.
Powered by blists - more mailing lists