From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754259AbdIEXKW (ORCPT ); Tue, 5 Sep 2017 19:10:22 -0400 Received: from ozlabs.org ([103.22.144.67]:50575 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752471AbdIEXKV (ORCPT ); Tue, 5 Sep 2017 19:10:21 -0400 Date: Wed, 6 Sep 2017 09:10:18 +1000 From: Stephen Rothwell To: Sinan Kaya Cc: Bjorn Helgaas , David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Ding Tianhong , Casey Leedom Subject: Re: linux-next: manual merge of the pci tree with the net tree Message-ID: <20170906091018.13e37960@canb.auug.org.au> In-Reply-To: <22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org> References: <20170816095128.7205e4f1@canb.auug.org.au> <20170904145427.60b35b0c@canb.auug.org.au> <22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sinan, On Tue, 5 Sep 2017 18:54:38 -0400 Sinan Kaya wrote: > > On 9/4/2017 12:54 AM, Stephen Rothwell wrote: > > Just a reminder that this conflict still exists. > > I suppose this was a message for Bjorn, right? Correct. It was just a reminder that he may have to tell Linus about the conflict when he asks Linus to merge his tree (depending on how complex the conflict is and if he gets in before Dave gets the net-next tree merged). -- Cheers, Stephen Rothwell