Re: linux-next: manual merge of the swiotlb tree with the dma-mapping tree

[Christoph Hellwig]

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.