lkml.org 
[lkml]   [2016]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the iommu tree with the samsung-krzk tree
Hi Stephen,

On Mon, Feb 29, 2016 at 03:20:55PM +1100, Stephen Rothwell wrote:
> Hi Joerg,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/memory/Kconfig
>
> between commit:
>
> 78fbb9361ca3 ("memory: Add support for Exynos SROM driver")
>
> from the samsung-krzk tree and commit:
>
> cc8bbe1a8312 ("memory: mediatek: Add SMI driver")
>
> from the iommu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for fixing this (and the other conflict before) up.



Joerg

\
 
 \ /
  Last update: 2016-02-29 09:21    [W:0.052 / U:0.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site