lkml.org 
[lkml]   [2018]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the pm tree with the i2c tree
Date
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!

\
 
 \ /
  Last update: 2018-01-14 23:25    [W:0.710 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site