linux-kernel - Re: linux-next: manual merge of the tip 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Sun, 5 Nov 2017 13:12:40 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc:     Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...nel.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Yonghong Song <yhs@...com>,
        Daniel Borkmann <daniel@...earbox.net>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree

Hi Alexei,

On Wed, 1 Nov 2017 09:27:14 -0700 Alexei Starovoitov <alexei.starovoitov@...il.com> wrote:
>
> Also what do you mean by "same patch != same commit" ?
> Like if we had pushed to some 3rd tree first and then pulled
> into tip and net-next it would have been better?

Well, it would not have caused a conflict.
-- 
Cheers,
Stephen Rothwell