linux-kernel - Re: linux-next: manual merge of the mtd tree with the vfs-brauner 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: <20231031-trauben-jobben-40074a43e5a0@brauner>
Date:   Tue, 31 Oct 2023 15:25:19 +0100
From:   Christian Brauner <brauner@...nel.org>
To:     Miquel Raynal <miquel.raynal@...tlin.com>
Cc:     Richard Weinberger <richard@....at>, Jan Kara <jack@...e.cz>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Richard Weinberger <richard.weinberger@...il.com>,
        linux-kernel <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mtd tree with the vfs-brauner
 tree

On Tue, Oct 31, 2023 at 02:50:06PM +0100, Miquel Raynal wrote:
> 
> richard@....at wrote on Tue, 31 Oct 2023 14:13:53 +0100 (CET):
> 
> > ----- Ursprüngliche Mail -----
> > > Von: "Miquel Raynal" <miquel.raynal@...tlin.com>  
> > >> Miquel, we could also keep ff6abbe85634 in the mtd tree and explain Linus the
> > >> conflict, what do you think? That would help with back porting to stable.  
> > > 
> > > It's not relevant if the patch in Brauner's tree is already fixing this
> > > up. Just send the smaller patch to stable@...r.kernel.org asking them to
> > > backport this patch instead of the other one, they are used to this
> > > kind of constraint, no?  
> > 
> > I'm just in fear of stable rule #1.
> > "It or an equivalent fix must already exist in Linus' tree (upstream)."
> 
> It should be very soon, the merge window is open ;)

vfs-6.7.super was merged yesterday, if that's what this is about.