linux-kernel - Re: linux-next: manual merge of the akpm tree with the arm 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160715083351.GD14726@flint.armlinux.org.uk>
Date:	Fri, 15 Jul 2016 09:33:51 +0100
From:	Russell King <rmk@...linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gregory CLEMENT <gregory.clement@...e-electrons.com>,
	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm tree

On Fri, Jul 15, 2016 at 06:29:47PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>   arch/arm/mm/dma-mapping.c
> 
> between commits:
> 
>   f12708965069 ("ARM: 8561/3: dma-mapping: Don't use outer_flush_range when the L2C is coherent")
>   565068221b90 ("ARM: 8561/4: dma-mapping: Fix the coherent case when iommu is used")
> 
> from the arm tree and patch:
> 
>    "ARM: dma-mapping: use unsigned long for dma_attrs"
> 
> from the akpm-current tree.

Thanks Stephen, resolution looks good to me.

-- 
Russell King
ARM architecture Linux Kernel maintainer