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

From: Jan Kara <jack@suse.cz>
To: Richard Weinberger <richard@nod.at>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Richard Weinberger <richard.weinberger@gmail.com>,
	Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
	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 09:51:58 +0100	[thread overview]
Message-ID: <20231031085158.o4ilb5d47sxcqm3o@quack3> (raw)
In-Reply-To: <1541110626.24818.1698696696387.JavaMail.zimbra@nod.at>

On Mon 30-10-23 21:11:36, Richard Weinberger wrote:
> ----- Ursprüngliche Mail -----
> > Von: "Miquel Raynal" <miquel.raynal@bootlin.com>
> >> Today's linux-next merge of the mtd tree got a conflict in:
> >> 
> >>   drivers/mtd/devices/block2mtd.c
> >> 
> >> between commit:
> >> 
> >>   1bcded92d938 ("mtd: block2mtd: Convert to bdev_open_by_dev/path()")
> > 
> > I haven't seen this commit, I was not Cc'ed.
> 
> Me neither. :-/

I'm sorry for that but I took the maintainers entry for BLOCK2MTD which is:

BLOCK2MTD DRIVER
M:      Joern Engel <joern@lazybastard.org>
L:      linux-mtd@lists.infradead.org
S:      Maintained
F:      drivers/mtd/devices/block2mtd.c

And both Joern and linux-mtd were CCed on the patch. If different people
should be CCed these days, please update the entry. Thanks!

> >> from the vfs-brauner tree and commit:
> >> 
> >>   ff6abbe85634 ("mtd: block2mtd: Add a valid holder to blkdev_put()")
> > 
> > I will drop this commit from mtd/next. Please take it through the
> > vfs-brauner tree as well to avoid conflicts or otherwise, Richard, can
> > you send an update at -rc1?
> 
> A side effect of 1bcded92d938 ("mtd: block2mtd: Convert to bdev_open_by_dev/path()")
> is that it fixes the problem too. That's a good thing.
> 
> I'm a bit puzzled how to fix the problem for 6.5.y and 6.6.y stable releases.
> Back porting 1bcded92d938 seems risky to me since the commit is large.
> On the other hand, ff6abbe85634 will not make it into Linus' tree and therefore
> is not suitable for stable either.

Yes, that's one of the cases where stable rules make life harder for actual
fixes... You can try pushing ff6abbe85634 to stable even if it is not
upstream since it fixes a real bug and taking the upstream solution is
indeed IMO too intrusive. Sometimes stable maintainers accept such fixes.

								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR