From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sinan Kaya <okaya@codeaurora.org>
Subject: Re: linux-next: manual merge of the pci tree with the net tree
Date: Tue, 5 Sep 2017 18:54:38 -0400
Message-ID: <22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org>
References: <20170816095128.7205e4f1@canb.auug.org.au>
 <20170904145427.60b35b0c@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Ding Tianhong <dingtianhong@huawei.com>,
        Casey Leedom <leedom@chelsio.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Bjorn Helgaas <bhelgaas@google.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Return-path: <linux-next-owner@vger.kernel.org>
In-Reply-To: <20170904145427.60b35b0c@canb.auug.org.au>
Content-Language: en-US
Sender: linux-next-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

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?

I looked at the change and it looked good to me.

-- 
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.