[lkml]   [2018]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the driver-core tree with the iommu tree
On Wed, Jul 11, 2018 at 01:14:45PM +1000, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the driver-core tree got a conflict in:
> drivers/iommu/ipmmu-vmsa.c
> between commits:
> 0b8ac1409641 ("iommu/ipmmu-vmsa: Hook up r8a7796 DT matching code")
> 3701c123e1c1 ("iommu/ipmmu-vmsa: Hook up r8a779(70|95) DT matching code")
> 98dbffd39a65 ("iommu/ipmmu-vmsa: Hook up R8A77965 DT matching code")
> from the iommu tree and commit:
> ac6bbf0cdf42 ("iommu: Remove IOMMU_OF_DECLARE")
> from the driver-core tree.
> I fixed it up (I removed the new IOMMU_OF_DECLARE() lines) 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.

Resolution seems sane to me, thanks.

greg k-h

 \ /
  Last update: 2018-07-11 12:59    [W:0.034 / U:18.552 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site