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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the iommu tree with the arm tree
Date	2016-06-20 05:30 +0200
Message-ID	<rLY4q-2Rt-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next 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