From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com ([119.145.14.64]:26506 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752631AbaAFHqK (ORCPT ); Mon, 6 Jan 2014 02:46:10 -0500 Message-ID: <52CA5F02.4090301@huawei.com> Date: Mon, 6 Jan 2014 15:45:06 +0800 From: Yijing Wang MIME-Version: 1.0 To: David Miller CC: , , , Subject: Re: [PATCH v3] sparc/PCI: Use dev_is_pci() to identify PCI devices References: <1386741626-35744-1-git-send-email-wangyijing@huawei.com> <20140104.210533.653844636617320862.davem@davemloft.net> <52CA020C.60206@huawei.com> <20140105.203535.32658751976534055.davem@davemloft.net> In-Reply-To: <20140105.203535.32658751976534055.davem@davemloft.net> Content-Type: text/plain; charset="ISO-8859-1" Sender: linux-pci-owner@vger.kernel.org List-ID: On 2014/1/6 9:35, David Miller wrote: > From: Yijing Wang > Date: Mon, 6 Jan 2014 09:08:28 +0800 > >> This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree? > > GIT will figure it out just fine. OK, thanks very much! > > -- Thanks! Yijing From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Mon, 06 Jan 2014 07:45:06 +0000 Subject: Re: [PATCH v3] sparc/PCI: Use dev_is_pci() to identify PCI devices Message-Id: <52CA5F02.4090301@huawei.com> List-Id: References: <1386741626-35744-1-git-send-email-wangyijing@huawei.com> <20140104.210533.653844636617320862.davem@davemloft.net> <52CA020C.60206@huawei.com> <20140105.203535.32658751976534055.davem@davemloft.net> In-Reply-To: <20140105.203535.32658751976534055.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Miller Cc: bhelgaas@google.com, linux-pci@vger.kernel.org, sparclinux@vger.kernel.org, guohanjun@huawei.com On 2014/1/6 9:35, David Miller wrote: > From: Yijing Wang > Date: Mon, 6 Jan 2014 09:08:28 +0800 > >> This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree? > > GIT will figure it out just fine. OK, thanks very much! > > -- Thanks! Yijing