linux-kernel - Re: linux-next: manual merge of the drivers-x86 tree with the net-next 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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 10 Oct 2017 14:49:20 +0300
From:   Mika Westerberg <mika.westerberg@...ux.intel.com>
To:     Darren Hart <dvhart@...radead.org>
Cc:     Mark Brown <broonie@...nel.org>,
        Mario Limonciello <mario.limonciello@...l.com>,
        Yehezkel Bernat <yehezkel.bernat@...el.com>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Amir Levy <amir.jer.levy@...el.com>,
        Michael Jamet <michael.jamet@...el.com>,
        "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the
 net-next tree

On Mon, Oct 09, 2017 at 04:18:10PM -0700, Darren Hart wrote:

> I'm not sure how we would deal with it in the trees. Best to note this during
> the merge window - whichever goes in second. Test merge will identify the merge
> conflict, and we can include a note to Linus on the preference.

That sounds good, thanks!