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

From	Russell King <rmk@armlinux.org.uk>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the iommu tree with the arm tree
Date	2016-06-20 10:10 +0200
Message-ID	<rM2ro-5J9-33@gated-at.bofh.it> (permalink)
References	<rLY4q-2Rt-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Jun 20, 2016 at 01:20:09PM +1000, Stephen Rothwell wrote:
> Hi Joerg,
> 
> Today's linux-next merge of the iommu tree got a conflict in:
> 
>   drivers/iommu/mtk_iommu.c
> 
> between commit:
> 
>   d267804c8457 ("iommu: convert DT component matching to component_match_add_release()")
> 
> from the arm tree and commit:
> 
>   da4d6e6d3b3e ("iommu/mediatek: Convert DT component matching to component_match_add_release()")
> 
> from the iommu tree.

This looks like it's going to end up being broken.  I self-NACK'd my v2
patch series was, and it looks like the v2 patch was picked up instead
of v1.

It's also part of a _three_ patch series, where the _second two_ patches
depend on the _first_ patch.  Such series can't be split up.

-- 
Russell King
ARM architecture Linux Kernel maintainer

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

Thread

linux-next: manual merge of the iommu tree with the arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-20 05:30 +0200
  Re: linux-next: manual merge of the iommu tree with the arm tree Russell King <rmk@armlinux.org.uk> - 2016-06-20 10:10 +0200

csiph-web