Re: linux-next: manual merge of the pm tree with the i2c tree
- Date: Fri, 12 Jan 2018 13:44:21 +0100
- From: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
- Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
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:
> 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.