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

[Greg KH]

On Mon, Jun 17, 2013 at 03:33:02PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/platform_device.h between commit 10dbc5e39a60 ("driver
> core: move to_platform_driver to platform_device.h") from the devicetree
> tree and commit 9447057eaff8 ("platform_device: use a macro instead of
> platform_driver_register") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix 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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/