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

[Catalin Marinas]

On Tue, Sep 23, 2014 at 08:23:39AM +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm-current tree got a conflict in
> arch/arm64/mm/dma-mapping.c between commit 2189064795dc ("arm64:
> Implement set_arch_dma_coherent_ops() to replace bus notifiers") from
> the arm64 tree and commit 50a477611cc9 ("arm64: add atomic pool for
> non-coherent and CMA allocations") from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

It looks fine. Thanks.

-- 
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/