Re: linux-next: manual merge of the akpm tree with the arm tree

From	Russell King <rmk@armlinux.org.uk>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the akpm tree with the arm tree
Date	2016-07-15 10:40 +0200
Message-ID	<rV6P8-4CX-31@gated-at.bofh.it> (permalink)
References	<rV6P8-4CX-33@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the akpm tree with the arm tree Russell King <rmk@armlinux.org.uk> - 2016-07-15 10:40 +0200

csiph-web