linux-kernel - Re: linux-next: manual merge of the vfs-brauner tree with the ext4 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240508165953.67afc064@canb.auug.org.au>
Date: Wed, 8 May 2024 16:59:53 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christoph Hellwig <hch@....de>
Cc: Christian Brauner <brauner@...nel.org>, Theodore Ts'o <tytso@....edu>,
 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

Hi Christoph,

On Wed, 8 May 2024 08:47:00 +0200 Christoph Hellwig <hch@....de> wrote:
>
> 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.

If the resolution I did is fine, I am sure Linus will cope (but worth
mentioning it to him in the pull request).  Its a simple enough conflict.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped