Messages in this thread | | | From | Andy Shevchenko <> | Date | Tue, 2 May 2017 23:57:18 +0300 | Subject | Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree |
| |
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
| |