[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20160229075636.GI22747@8bytes.org>
Date: Mon, 29 Feb 2016 08:56:36 +0100
From: Joerg Roedel <joro@...tes.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Krzysztof Kozlowski <k.kozlowski@...sung.com>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Pankaj Dubey <pankaj.dubey@...sung.com>,
Yong Wu <yong.wu@...iatek.com>,
Matthias Brugger <matthias.bgg@...il.com>
Subject: Re: 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
Powered by blists - more mailing lists