From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Darren Hart <dvhart@infradead.org>
Cc: Guenter Roeck <linux@roeck-us.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Wim Van Sebroeck <wim@iguana.be>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree
Date: Tue, 2 May 2017 23:57:18 +0300 [thread overview]
Message-ID: <CAHp75VeCGUh_AYFKWwm4riFBGC1dgifchUQSr_2dO3mo_pUx1Q@mail.gmail.com> (raw)
In-Reply-To: <20170502202159.GC26866@fury>
On Tue, May 2, 2017 at 11:21 PM, Darren Hart <dvhart@infradead.org> wrote:
> On Tue, May 02, 2017 at 12:12:17PM -0700, Guenter Roeck wrote:
>> On Tue, May 02, 2017 at 11:09:40AM -0700, Darren Hart wrote:
>> > On Tue, May 02, 2017 at 02:04:03PM +1000, Stephen Rothwell wrote:
> From my perspective, the most direct solution would be to drop these two patches
> from the watchdog tree and let them go through the platform driver x86 tree with
> Guenter's Acked-by. If you have additional patches which depend on these two,
> then if you will provide an immutable branch we can merge, we can do that too
> (but I try to keep the number of external merges to a minimum - which is
> becoming increasingly difficult lately for some reason).
Sorry for not being in doubt, I just decided that Ack from Guenter
means that default case is to go through PDx86 tree without any
additional agreement.
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2017-05-02 20:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 4:04 linux-next: manual merge of the drivers-x86 tree with the watchdog tree Stephen Rothwell
2017-05-02 18:09 ` Darren Hart
2017-05-02 19:12 ` Guenter Roeck
2017-05-02 20:21 ` Darren Hart
2017-05-02 20:57 ` Andy Shevchenko [this message]
2017-05-02 21:30 ` Darren Hart
2017-05-02 21:58 ` Guenter Roeck
2017-05-02 22:35 ` Darren Hart
2017-05-03 14:24 ` Wim Van Sebroeck
2017-05-03 14:43 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2019-03-04 3:37 Stephen Rothwell
2019-03-07 5:27 ` Darren Hart
2019-03-07 5:42 ` Darren Hart
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=CAHp75VeCGUh_AYFKWwm4riFBGC1dgifchUQSr_2dO3mo_pUx1Q@mail.gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--cc=wim@iguana.be \
/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).