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

From	Andy Shevchenko <andy.shevchenko@gmail.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the pm tree with the i2c tree
Date	2016-07-25 14:10 +0200
Message-ID	<rYMRP-4pv-3@gated-at.bofh.it> (permalink)
References	<rV0Tn-ZV-1@gated-at.bofh.it> <rVaSK-70X-11@gated-at.bofh.it> <rVYPv-46h-5@gated-at.bofh.it> <rWt6W-6qm-11@gated-at.bofh.it> <rWucF-76K-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang <wsa@the-dreams.de> 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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the pm tree with the i2c tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-15 04:20 +0200
  Re: linux-next: manual merge of the pm tree with the i2c tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-15 04:30 +0200
    Re: linux-next: manual merge of the pm tree with the i2c tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-15 14:20 +0200
      Re: linux-next: manual merge of the pm tree with the i2c tree Wolfram Sang <wsa@the-dreams.de> - 2016-07-15 14:40 +0200
        Re: linux-next: manual merge of the pm tree with the i2c tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-15 14:40 +0200
        Re: linux-next: manual merge of the pm tree with the i2c tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-15 15:00 +0200
          Re: linux-next: manual merge of the pm tree with the i2c tree Wolfram Sang <wsa@the-dreams.de> - 2016-07-17 20:20 +0200
            Re: linux-next: manual merge of the pm tree with the i2c tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-19 04:40 +0200
              Re: linux-next: manual merge of the pm tree with the i2c tree Wolfram Sang <wsa@the-dreams.de> - 2016-07-19 05:50 +0200
                Re: linux-next: manual merge of the pm tree with the i2c tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-19 15:00 +0200
                Re: linux-next: manual merge of the pm tree with the i2c tree Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-07-25 14:10 +0200

csiph-web