Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Tue, 31 Oct 2023 15:46:31 +0100
From:   Miquel Raynal <miquel.raynal@bootlin.com>
To:     Christian Brauner <brauner@kernel.org>
Cc:     Richard Weinberger <richard@nod.at>, Jan Kara <jack@suse.cz>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Richard Weinberger <richard.weinberger@gmail.com>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mtd tree with the vfs-brauner
 tree
Message-ID: <20231031154631.61e5f83e@xps-13>
In-Reply-To: <20231031-trauben-jobben-40074a43e5a0@brauner>
References: <20231030103415.401ce804@canb.auug.org.au>
        <20231030173228.691620ca@xps-13>
        <1541110626.24818.1698696696387.JavaMail.zimbra@nod.at>
        <20231031085158.o4ilb5d47sxcqm3o@quack3>
        <1419418117.26823.1698742930275.JavaMail.zimbra@nod.at>
        <20231031-laienhaft-weshalb-bc27f8dacd9e@brauner>
        <2131754563.27779.1698751840800.JavaMail.zimbra@nod.at>
        <20231031134522.27e78274@xps-13>
        <440004449.28174.1698758033696.JavaMail.zimbra@nod.at>
        <20231031145006.3df11822@xps-13>
        <20231031-trauben-jobben-40074a43e5a0@brauner>
Organization: Bootlin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Christian,

brauner@kernel.org wrote on Tue, 31 Oct 2023 15:25:19 +0100:

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

Great, thanks for the confirmation. Then Richard you have your upstream
commit already!

Thanks,
Miqu=C3=A8l