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 S1755946AbdKJEiD (ORCPT <rfc822;w@1wt.eu>);
        Thu, 9 Nov 2017 23:38:03 -0500
Received: from mail-pg0-f48.google.com ([74.125.83.48]:48307 "EHLO
        mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1755232AbdKJEiC (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 9 Nov 2017 23:38:02 -0500
X-Google-Smtp-Source: ABhQp+QMuh8G6rGwHXjax4Gz4tYBIFrnJN6eWkiK1/bJW1UDTsXyZxsyxfig4KSInqHw15kz5aqwVXpwoAPBzwC0Q1M=
MIME-Version: 1.0
In-Reply-To: <20171110103100.3cffee49@canb.auug.org.au>
References: <20171110103100.3cffee49@canb.auug.org.au>
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Thu, 9 Nov 2017 20:37:41 -0800
Message-ID: <CAM_iQpVYtLgwRqYKWGA_iRA6-XFssyPs8ZDkK4yL2vjcN_te4g@mail.gmail.com>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Nov 9, 2017 at 3:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

It looks good to me.

Thanks!