Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1345532

Re: linux-next: manual merge of the iommu tree with the samsung-krzk tree

Show all headers | View raw

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

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

Thread

linux-next: manual merge of the iommu tree with the samsung-krzk  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-29 05:30 +0100
  Re: linux-next: manual merge of the iommu tree with the samsung-krzk  tree Joerg Roedel <joro@8bytes.org> - 2016-02-29 09:00 +0100

csiph-web