From: Richard Weinberger <richard@nod.at>
To: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: 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: Mon, 30 Oct 2023 21:11:36 +0100 (CET) [thread overview]
Message-ID: <1541110626.24818.1698696696387.JavaMail.zimbra@nod.at> (raw)
In-Reply-To: <20231030173228.691620ca@xps-13>
----- 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. :-/
>> 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.
Thanks,
//richard
next prev parent reply other threads:[~2023-10-30 20:11 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 [this message]
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
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=1541110626.24818.1698696696387.JavaMail.zimbra@nod.at \
--to=richard@nod.at \
--cc=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=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).