From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751467AbbAPJK0 (ORCPT ); Fri, 16 Jan 2015 04:10:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:54774 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750741AbbAPJKT (ORCPT ); Fri, 16 Jan 2015 04:10:19 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Yijing Wang , Bjorn Helgaas , Liviu Dudau , Tony Luck , Russell King , Marc Zyngier , linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , linux-m68k@vger.kernel.org, Geert Uytterhoeven , linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, Thomas Gleixner , Guan Xuetao , Yinghai Lu , Jiang Liu , Lorenzo Pieralisi Subject: Re: [PATCH 08/28] PCI: Introduce pci_host_assign_domain_nr() to assign domain Date: Fri, 16 Jan 2015 10:08:45 +0100 Message-ID: <13182982.DnZJMY2KHL@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1421372666-12288-9-git-send-email-wangyijing@huawei.com> References: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> <1421372666-12288-9-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:nPQTclYoAhYdZySrtPXMJ340KJ8i52Qlyp5qAkt+fhca670qOz4 Mrql8Ww72g+iWaAuR+3CZZ9mnkbBdbRkRYoCrJno+UoZFFCFOkVimzSxeEKDuCduWuewIuN gW+93OLXVKqr3lL/fr/L/9KNOxvUlKSwGO44L1Jrc6dMMihE1Xca40+WPrxwOL9AGcUUsko hRyQutV3JNiwTvnl6JKvA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday 16 January 2015 09:44:06 Yijing Wang wrote: > Introduce pci_host_assign_domain_nr() to assign domain > number for pci_host_bridge. Later we will remove > pci_bus_assign_domain_nr(). > > Signed-off-by: Yijing Wang I'm confused: the same code is already part of the PCI tree, but with Lorenzo Pieralisi listed as the patch author. The code is good, and I acked it in the past, but one of you is (probably by accident) misattributing the patch. Assuming that the patch that is already merged in next is the right one, I think you should rebase your series on top of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next to avoid conflicts like this one. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([212.227.17.10]:54774 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750741AbbAPJKT (ORCPT ); Fri, 16 Jan 2015 04:10:19 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Yijing Wang , Bjorn Helgaas , Liviu Dudau , Tony Luck , Russell King , Marc Zyngier , linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, Thomas Gleixner , Guan Xuetao , Yinghai Lu , Jiang Liu , Lorenzo Pieralisi Subject: Re: [PATCH 08/28] PCI: Introduce pci_host_assign_domain_nr() to assign domain Date: Fri, 16 Jan 2015 10:08:45 +0100 Message-ID: <13182982.DnZJMY2KHL@wuerfel> In-Reply-To: <1421372666-12288-9-git-send-email-wangyijing@huawei.com> References: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> <1421372666-12288-9-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-pci-owner@vger.kernel.org List-ID: On Friday 16 January 2015 09:44:06 Yijing Wang wrote: > Introduce pci_host_assign_domain_nr() to assign domain > number for pci_host_bridge. Later we will remove > pci_bus_assign_domain_nr(). > > Signed-off-by: Yijing Wang I'm confused: the same code is already part of the PCI tree, but with Lorenzo Pieralisi listed as the patch author. The code is good, and I acked it in the past, but one of you is (probably by accident) misattributing the patch. Assuming that the patch that is already merged in next is the right one, I think you should rebase your series on top of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next to avoid conflicts like this one. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 16 Jan 2015 10:08:45 +0100 Subject: [PATCH 08/28] PCI: Introduce pci_host_assign_domain_nr() to assign domain In-Reply-To: <1421372666-12288-9-git-send-email-wangyijing@huawei.com> References: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> <1421372666-12288-9-git-send-email-wangyijing@huawei.com> Message-ID: <13182982.DnZJMY2KHL@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Friday 16 January 2015 09:44:06 Yijing Wang wrote: > Introduce pci_host_assign_domain_nr() to assign domain > number for pci_host_bridge. Later we will remove > pci_bus_assign_domain_nr(). > > Signed-off-by: Yijing Wang I'm confused: the same code is already part of the PCI tree, but with Lorenzo Pieralisi listed as the patch author. The code is good, and I acked it in the past, but one of you is (probably by accident) misattributing the patch. Assuming that the patch that is already merged in next is the right one, I think you should rebase your series on top of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next to avoid conflicts like this one. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Date: Fri, 16 Jan 2015 09:08:45 +0000 Subject: Re: [PATCH 08/28] PCI: Introduce pci_host_assign_domain_nr() to assign domain Message-Id: <13182982.DnZJMY2KHL@wuerfel> List-Id: References: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> <1421372666-12288-9-git-send-email-wangyijing@huawei.com> In-Reply-To: <1421372666-12288-9-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org Cc: Yijing Wang , Bjorn Helgaas , Liviu Dudau , Tony Luck , Russell King , Marc Zyngier , linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , linux-m68k@vger.kernel.org, Geert Uytterhoeven , linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, Thomas Gleixner , Guan Xuetao , Yinghai Lu , Jiang Liu , Lorenzo Pieralisi On Friday 16 January 2015 09:44:06 Yijing Wang wrote: > Introduce pci_host_assign_domain_nr() to assign domain > number for pci_host_bridge. Later we will remove > pci_bus_assign_domain_nr(). > > Signed-off-by: Yijing Wang I'm confused: the same code is already part of the PCI tree, but with Lorenzo Pieralisi listed as the patch author. The code is good, and I acked it in the past, but one of you is (probably by accident) misattributing the patch. Assuming that the patch that is already merged in next is the right one, I think you should rebase your series on top of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next to avoid conflicts like this one. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH 08/28] PCI: Introduce pci_host_assign_domain_nr() to assign domain Date: Fri, 16 Jan 2015 10:08:45 +0100 Message-ID: <13182982.DnZJMY2KHL@wuerfel> References: <1421372666-12288-1-git-send-email-wangyijing@huawei.com> <1421372666-12288-9-git-send-email-wangyijing@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1421372666-12288-9-git-send-email-wangyijing@huawei.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-arm-kernel@lists.infradead.org Cc: Liviu Dudau , Tony Luck , Russell King , Marc Zyngier , linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Jiang Liu , Bjorn Helgaas , linux-m68k@lists.linux-m68k.org, Lorenzo Pieralisi , Geert Uytterhoeven , linux-alpha@vger.kernel.org, Yijing Wang , linux-ia64@vger.kernel.org, Thomas Gleixner , Guan Xuetao , Yinghai Lu , "David S. Miller" On Friday 16 January 2015 09:44:06 Yijing Wang wrote: > Introduce pci_host_assign_domain_nr() to assign domain > number for pci_host_bridge. Later we will remove > pci_bus_assign_domain_nr(). > > Signed-off-by: Yijing Wang I'm confused: the same code is already part of the PCI tree, but with Lorenzo Pieralisi listed as the patch author. The code is good, and I acked it in the past, but one of you is (probably by accident) misattributing the patch. Assuming that the patch that is already merged in next is the right one, I think you should rebase your series on top of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next to avoid conflicts like this one. Arnd