From: Christian Brauner <brauner@kernel.org>
To: Miquel Raynal <miquel.raynal@bootlin.com>
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
Date: Tue, 31 Oct 2023 15:25:19 +0100 [thread overview]
Message-ID: <20231031-trauben-jobben-40074a43e5a0@brauner> (raw)
In-Reply-To: <20231031145006.3df11822@xps-13>
On Tue, Oct 31, 2023 at 02:50:06PM +0100, Miquel Raynal wrote:
>
> richard@nod.at wrote on Tue, 31 Oct 2023 14:13:53 +0100 (CET):
>
> > ----- 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)."
>
> It should be very soon, the merge window is open ;)
vfs-6.7.super was merged yesterday, if that's what this is about.
next prev parent reply other threads:[~2023-10-31 14:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 23:34 linux-next: manual merge of the mtd tree with the vfs-brauner tree Stephen Rothwell
2023-10-30 16:32 ` Miquel Raynal
2023-10-30 20:11 ` Richard Weinberger
2023-10-31 8:51 ` Jan Kara
2023-10-31 9:02 ` Richard Weinberger
2023-10-31 10:33 ` Christian Brauner
2023-10-31 11:30 ` Richard Weinberger
2023-10-31 12:45 ` Miquel Raynal
2023-10-31 13:13 ` Richard Weinberger
2023-10-31 13:50 ` Miquel Raynal
2023-10-31 14:25 ` Christian Brauner [this message]
2023-10-31 14:46 ` Miquel Raynal
2023-10-31 14:50 ` Richard Weinberger
2023-10-31 12:29 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231031-trauben-jobben-40074a43e5a0@brauner \
--to=brauner@kernel.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard.weinberger@gmail.com \
--cc=richard@nod.at \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).