linux-kernel - Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHp75VeCGUh_AYFKWwm4riFBGC1dgifchUQSr_2dO3mo_pUx1Q@mail.gmail.com>
Date:   Tue, 2 May 2017 23:57:18 +0300
From:   Andy Shevchenko <andy.shevchenko@...il.com>
To:     Darren Hart <dvhart@...radead.org>
Cc:     Guenter Roeck <linux@...ck-us.net>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Wim Van Sebroeck <wim@...ana.be>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kuppuswamy Sathyanarayanan 
        <sathyanarayanan.kuppuswamy@...ux.intel.com>
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@...radead.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