Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
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
Precedence: bulk

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!

From 1583633222255996540@xxx Thu Nov 09 23:32:10 +0000 2017
X-GM-THRID: 1583633222255996540
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread