Re: linux-next: manual merge of the driver-core tree with the iommu tree

Greg KH
2014-05-28T18:31:51Z

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