From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753623AbdIEWyn (ORCPT ); Tue, 5 Sep 2017 18:54:43 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49338 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752404AbdIEWyk (ORCPT ); Tue, 5 Sep 2017 18:54:40 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1F7B760250 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org Subject: Re: linux-next: manual merge of the pci tree with the net tree To: Stephen Rothwell , Bjorn Helgaas , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Ding Tianhong , Casey Leedom References: <20170816095128.7205e4f1@canb.auug.org.au> <20170904145427.60b35b0c@canb.auug.org.au> From: Sinan Kaya Message-ID: <22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org> Date: Tue, 5 Sep 2017 18:54:38 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20170904145427.60b35b0c@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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.