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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210819070345.GB4521@lst.de>
Date:   Thu, 19 Aug 2021 09:03:45 +0200
From:   Christoph Hellwig <hch@....de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
        Christoph Hellwig <hch@....de>,
        Claire Chang <tientzu@...omium.org>,
        Konrad Rzeszutek Wilk <konrad@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the swiotlb tree with the
 dma-mapping tree

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.