Re: linux-next: manual merge of the pm tree with the i2c tree

From: Andy Shevchenko
Date: Mon Jul 25 2016 - 08:03:20 EST

On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang <wsa@xxxxxxxxxxxxx> wrote:
>> > Well, not knowing much about ACPI, I just need the conflict resolution
>> > for my latest i2c/for-next and your above branch. If you want to do it,
>> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>> Unfortunately, I don't see how these branches can be merged in a sensible
>> way without adding too much new code into the merge itself.
>> Something needs to be dropped and then rebased and applied again.
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Jarkko and Mika are on holidays, I recently noticed this thread,
sorry. For now your solution seems okay, since we can't push broken
parts into v4.8-rc1.

With Best Regards,
Andy Shevchenko