From: Christoph Hellwig <hch@lst.de>
To: Mark Brown <broonie@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
John Garry <john.garry@linux.dev>,
Keith Busch <kbusch@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>
Subject: Re: linux-next: manual merge of the block tree with the dma-mapping tree
Date: Fri, 16 Oct 2026 14:24:48 +0200 [thread overview]
Message-ID: <20261016122448.GA3555@lst.de> (raw)
In-Reply-To: <atIV_5MZCayGDCSz@sirena.org.uk>
On Fri, Oct 16, 2026 at 01:18:07PM +0100, Mark Brown wrote:
> I fixed it up (see below) 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.
Yeah, basically take the block tree version and do the rename in the
dma-mapping tree. This is probably easier to merge at this "intent"
level than down on the per-line level.
next prev parent reply other threads:[~2026-10-16 12:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-16 12:18 linux-next: manual merge of the block tree with the dma-mapping tree Mark Brown
2026-10-16 12:24 ` Christoph Hellwig [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-15 22:44 Mark Brown
2018-01-17 2:38 Stephen Rothwell
2018-01-17 16:18 ` Christoph Hellwig
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=20261016122448.GA3555@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=broonie@kernel.org \
--cc=john.garry@linux.dev \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
/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