On Monday, November 14, 2016 01:09:02 PM Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/power/main.c
>
> between commit:
>
> 6f75c3fd56da ("PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails")
>
> from the pm tree and commit:
>
> 8c73b4288496 ("PM / sleep: Make async suspend/resume of devices use device links")
>
> from the driver-core tree.
Well, right. The device links series predates the Brian's fix (which is in -rc5
already, BTW).
> I fixed it up (maybe .. see below) and can carry the fix as necessary.
That's the correct one, thanks Stephen!
Cheers,
Rafael
--
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
