On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/i2c/busses/i2c-designware-platdrv.c
>
> between commit:
>
> 0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk")
>
> from the i2c tree and commit:
>
> 02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
The fix looks good to me.
Thanks!
--
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
