From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Christoph Hellwig <hch@lst.de>,
Claire Chang <tientzu@chromium.org>,
Konrad Rzeszutek Wilk <konrad@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the swiotlb tree with the dma-mapping tree
Date: Thu, 19 Aug 2021 09:03:45 +0200 [thread overview]
Message-ID: <20210819070345.GB4521@lst.de> (raw)
In-Reply-To: <20210819111312.697fc48f@canb.auug.org.au>
On Thu, Aug 19, 2021 at 11:13:12AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the swiotlb tree got a conflict in:
>
> kernel/dma/direct.c
>
> between commit:
>
> faf4ef823ac5 ("dma-direct: add support for dma_coherent_default_memory")
>
> from the dma-mapping tree and commit:
>
> f4111e39a52a ("swiotlb: Add restricted DMA alloc/free support")
>
> from the swiotlb tree.
>
> I fixed it up (see below, though more may be needed) and can carry the
Thanks, the fix looks good.
prev parent reply other threads:[~2021-08-19 7:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 1:13 linux-next: manual merge of the swiotlb tree with the dma-mapping tree Stephen Rothwell
2021-08-19 7:03 ` Christoph Hellwig [this message]
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=20210819070345.GB4521@lst.de \
--to=hch@lst.de \
--cc=konrad.wilk@oracle.com \
--cc=konrad@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tientzu@chromium.org \
/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).