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 S1754402AbdKAK5P (ORCPT <rfc822;w@1wt.eu>);
        Wed, 1 Nov 2017 06:57:15 -0400
Received: from ozlabs.org ([103.22.144.67]:36731 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751495AbdKAK5N (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 1 Nov 2017 06:57:13 -0400
Date: Wed, 1 Nov 2017 21:57:10 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Yonghong Song <yhs@fb.com>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree
Message-ID: <20171101215710.3f222e70@canb.auug.org.au>
In-Reply-To: <20171101085524.4dcxgaq7kawn37pq@hirez.programming.kicks-ass.net>
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>
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 Peter,

On Wed, 1 Nov 2017 09:55:24 +0100 Peter Zijlstra <peterz@infradead.org> wrote:
>
> Hmm, I thought having that same base patch in both trees would allow it
> to resolve that conflict. A well..

There is a difference between having he same patch and the same commit ...

-- 
Cheers,
Stephen Rothwell