From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Richard Weinberger <richard.weinberger@gmail.com>,
Christian Brauner <brauner@kernel.org>
Cc: Jan Kara <jack@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>
Subject: linux-next: manual merge of the mtd tree with the vfs-brauner tree
Date: Mon, 30 Oct 2023 10:34:15 +1100 [thread overview]
Message-ID: <20231030103415.401ce804@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi all,
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()")
from the vfs-brauner tree and commit:
ff6abbe85634 ("mtd: block2mtd: Add a valid holder to blkdev_put()")
from the mtd tree.
I fixed it up (I just used the former) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-29 23:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 23:34 Stephen Rothwell [this message]
2023-10-30 16:32 ` linux-next: manual merge of the mtd tree with the vfs-brauner tree 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
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=20231030103415.401ce804@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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=richard@nod.at \
/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