From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752651AbdKECMo (ORCPT <rfc822;w@1wt.eu>);
        Sat, 4 Nov 2017 22:12:44 -0400
Received: from ozlabs.org ([103.22.144.67]:56383 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752576AbdKECMn (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Sat, 4 Nov 2017 22:12:43 -0400
Date: Sun, 5 Nov 2017 13:12:40 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@kernel.org>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Yonghong Song <yhs@fb.com>, Daniel Borkmann <daniel@iogearbox.net>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree
Message-ID: <20171105131240.490847fa@canb.auug.org.au>
In-Reply-To: <20171101162712.inf4ejbxmfm2kzie@ast-mbp>
References: <20171101181554.1826e8c8@canb.auug.org.au>
        <20171101081832.zdehp7ysi5ecwsdv@hirez.programming.kicks-ass.net>
        <20171101082742.dteg337holmodzn2@gmail.com>
        <20171101085524.4dcxgaq7kawn37pq@hirez.programming.kicks-ass.net>
        <20171101162712.inf4ejbxmfm2kzie@ast-mbp>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Alexei,

On Wed, 1 Nov 2017 09:27:14 -0700 Alexei Starovoitov <alexei.starovoitov@gmail.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