From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Octavian Purdila <octavian.purdila@intel.com>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
Date: Mon, 25 Jul 2016 15:03:01 +0300 [thread overview]
Message-ID: <CAHp75Vd=8d6upXK4f-tKQopQR649oSU_TeZYzu=epOf-0DznSA@mail.gmail.com> (raw)
In-Reply-To: <20160719034806.GA1640@katana>
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
next prev parent reply other threads:[~2016-07-25 12:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 2:17 linux-next: manual merge of the pm tree with the i2c tree Stephen Rothwell
2016-07-15 2:28 ` Stephen Rothwell
2016-07-15 12:19 ` Rafael J. Wysocki
2016-07-15 12:32 ` Wolfram Sang
2016-07-15 12:40 ` Rafael J. Wysocki
2016-07-15 12:59 ` Rafael J. Wysocki
2016-07-17 18:14 ` Wolfram Sang
2016-07-19 2:41 ` Rafael J. Wysocki
2016-07-19 3:48 ` Wolfram Sang
2016-07-19 12:55 ` Rafael J. Wysocki
2016-07-25 12:03 ` Andy Shevchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-29 12:18 broonie
2022-10-05 0:18 ` Stephen Rothwell
2022-10-05 7:12 ` Uwe Kleine-König
2022-02-07 23:11 Stephen Rothwell
2018-10-29 2:09 Stephen Rothwell
2018-10-30 7:32 ` Rafael J. Wysocki
2018-01-11 23:27 Stephen Rothwell
2018-01-12 12:44 ` Rafael J. Wysocki
2016-01-06 1:39 Stephen Rothwell
2016-01-06 2:15 ` Rafael J. Wysocki
2016-01-06 8:20 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHp75Vd=8d6upXK4f-tKQopQR649oSU_TeZYzu=epOf-0DznSA@mail.gmail.com' \
--to=andy.shevchenko@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=octavian.purdila@intel.com \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).