Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1446006

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

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

> > 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.

Thanks for looking into it!

   Wolfram

Back to linux.kernel | Previous | Next — Previous in thread | Next 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