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

Groups > linux.kernel > #1426165 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  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

#1426165 — linux-next: manual merge of the iommu tree with the arm tree

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.

These are clearly 2 versions of the same patch.

I fixed it up (I assumed that tha iommu tree version was newer and used
that) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]

#1426311

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web