Re: linux-next: manual merge of the driver-core tree with the iommu tree
Hi all, On Wed, 11 Jul 2018 13:14:45 +1000 Stephen Rothwell wrote: > > 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. This is now a conflict between Linus' tree and the iommu tree. -- Cheers, Stephen Rothwell pgpE5XPJfcurR.pgp Description: OpenPGP digital signature
Re: 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
Re: linux-next: manual merge of the driver-core tree with the iommu tree
On Wed, May 28, 2014 at 05:55:31PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/iommu/exynos-iommu.c between commit 7222e8db2d50 > ("iommu/exynos: Fix build errors") from the iommu tree and commit > 8283b4919e00 ("driver core: dev_set_drvdata can no longer fail") from > the driver-core tree. > > I fixed it up (the former removed the code changed by the latter) and > can carry the fix as necessary (no action is required). Sounds good, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the driver-core tree with the iommu tree
On Wed, Feb 06, 2013 at 04:25:23PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/iommu/tegra-smmu.c between commit a6870e928d1b ("iommu/tegra: > smmu: Support variable MMIO ranges/blocks") from the iommu tree and > commit bc5e6dea81b0 ("iommu: Convert to devm_ioremap_resource()") from > the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good to me, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/