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

[Stephen Rothwell]

Hi all,

On Mon, 10 Nov 2014 15:21:25 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/leds/leds-gpio.c between commit a43f2cbbb009 ("leds: leds-gpio:
> Make use of device property API") from the  tree and commit
> 81902d5f658f ("leds: drop owner assignment from platform_drivers") from
> the driver-core tree.

This involved the pm tree, of course.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpxrTzn8BAd3.pgp
Description: OpenPGP digital signature