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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html