linux-kernel - Re: linux-next: manual merge of the arm64 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: <20190912123139.kuucii4sltycgy3p@willie-the-truck>
Date:   Thu, 12 Sep 2019 13:31:39 +0100
From:   Will Deacon <will@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Catalin Marinas <catalin.marinas@....com>,
        Christoph Hellwig <hch@....de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mark Rutland <mark.rutland@....com>
Subject: Re: linux-next: manual merge of the arm64 tree with the dma-mapping
 tree

Hi Stephen,

On Thu, Sep 12, 2019 at 09:55:58PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
> 
>   arch/arm64/include/asm/dma-mapping.h
> 
> between commit:
> 
>   5489c8e0cf03 ("arm64: use asm-generic/dma-mapping.h")
> 
> from the dma-mapping tree and commit:
> 
>   b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards")
> 
> from the arm64 tree.
> 
> I fixed it up (I just removed the file) 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.

Thanks. Killing the file is the right thing to do.

Will