From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Will Deacon <will@kernel.org>, Christoph Hellwig <hch@lst.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: Re: linux-next: manual merge of the arm64 tree with the dma-mapping tree
Date: Fri, 8 Nov 2019 10:25:17 +0000 [thread overview]
Message-ID: <20191108102517.GO51202@arrakis.emea.arm.com> (raw)
In-Reply-To: <20191108081109.28867ba1@canb.auug.org.au>
On Fri, Nov 08, 2019 at 08:11:09AM +1100, Stephen Rothwell wrote:
> diff --cc include/linux/dma-direct.h
> index 6db863c3eb93,d03af3605460..000000000000
> --- a/include/linux/dma-direct.h
> +++ b/include/linux/dma-direct.h
> @@@ -3,11 -3,10 +3,13 @@@
> #define _LINUX_DMA_DIRECT_H 1
>
> #include <linux/dma-mapping.h>
> +#include <linux/memblock.h> /* for min_low_pfn */
> #include <linux/mem_encrypt.h>
>
> + extern unsigned int zone_dma_bits;
> +
> +static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
> +
> #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
> #include <asm/dma-direct.h>
> #else
The resolution is fine. Thanks Stephen.
--
Catalin
next prev parent reply other threads:[~2019-11-08 10:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 21:11 linux-next: manual merge of the arm64 tree with the dma-mapping tree Stephen Rothwell
2019-11-08 10:25 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-12 11:55 Stephen Rothwell
2019-09-12 12:31 ` Will Deacon
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=20191108102517.GO51202@arrakis.emea.arm.com \
--to=catalin.marinas@arm.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nsaenzjulienne@suse.de \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.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