lkml.org 
[lkml]   [2024]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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.


\
 
 \ /
  Last update: 2024-05-08 08:47    [W:0.026 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site