Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Tue, 31 Oct 2023 14:13:53 +0100 (CET)
From:   Richard Weinberger <richard@nod.at>
To:     Miquel Raynal <miquel.raynal@bootlin.com>
Cc:     Christian Brauner <brauner@kernel.org>, 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>
Message-ID: <440004449.28174.1698758033696.JavaMail.zimbra@nod.at>
In-Reply-To: <20231031134522.27e78274@xps-13>
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>
Subject: Re: linux-next: manual merge of the mtd tree with the vfs-brauner
 tree
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT
Thread-Topic: linux-next: manual merge of the mtd tree with the vfs-brauner tree
Thread-Index: t2uz7aNH9GoEU2quLgpVm8VgSIfvYg==
Precedence: bulk

----- Ursprüngliche Mail -----
> Von: "Miquel Raynal" <miquel.raynal@bootlin.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@vger.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)."

Anyway, I'll try.

Thanks,
//richard