Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751881Ab2ESEiT (ORCPT ); Sat, 19 May 2012 00:38:19 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:35617 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750827Ab2ESEiQ convert rfc822-to-8bit (ORCPT ); Sat, 19 May 2012 00:38:16 -0400 MIME-Version: 1.0 In-Reply-To: References: <1336422606-4244-1-git-send-email-yinghai@kernel.org> Date: Fri, 18 May 2012 21:38:15 -0700 X-Google-Sender-Auth: YP9y-0r6dEd8oEQsnb34KUbJS_4 Message-ID: Subject: Re: [PATCH 00/21] PCI: use busn_res to replace bus secondary/subordinate From: Yinghai Lu To: Bjorn Helgaas Cc: Benjamin Herrenschmidt , Tony Luck , David Miller , x86 , Dominik Brodowski , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2814 Lines: 73 On Fri, May 18, 2012 at 4:32 PM, Bjorn Helgaas wrote: > On Thu, May 17, 2012 at 8:13 PM, Yinghai Lu wrote: >> On Thu, May 17, 2012 at 3:19 PM, Bjorn Helgaas wrote: >>> Sigh. ?You previously said we should do this order: >>> >>> ? ? ? ?for-pci-hostbridge-cleanup >>> ? ? ? ?for-pci-busn-alloc >>> ? ? ? ?for-pci-res-alloc >>> ? ? ? ?for-pci-root-bus-hotplug >>> ? ? ? ?for-pci-for-each-res-addon >>> >>> I merged for-pci-hostbridge-cleanup already. ?I was about to start >>> merging for-pci-busn-alloc. >>> >>> But now you added for-pci-hotplug-cleanup and made for-pci-busn-alloc >>> depend on it. ?I have some comments on for-pci-hotplug-cleanup, so I'm >>> not ready to merge it quite yet. ?Can you please just go back to the >>> original order and put the new hotplug cleanup stuff at the *end*? >> >> ok, update for-pci-busn_res branch, now it is based on your next branch. >> >> git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git >> for-pci-busn_res > > OK. ?You just incorporated the hotplug-cleanup stuff into that branch, > which isn't what I had in mind. ?But in the interest of making forward > progress, I merged as much as I could. ?The result is at: > > ?git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next-3.5 > > After Linus pulls my current "next" branch during the merge window, > I'll put the "next-3.5" stuff into the "next" branch. Great! Thanks a lot. looks one of commit author is messed up. http://git.kernel.org/?p=linux/kernel/git/helgaas/pci.git;a=commitdiff;h=b20238f05059818de8edd76cb5523b6bf8e26527 author Bjorn Helgaas Fri, 18 May 2012 17:35:50 +0000 (11:35 -0600) committer Bjorn Helgaas Fri, 18 May 2012 20:00:35 +0000 (14:00 -0600) Will use them insert/update busn res in pci_bus struct. [bhelgaas: print conflicting entry if insertion fails] Signed-off-by: Yinghai Lu Signed-off-by: Bjorn Helgaas but if changing it would take you too much time, just leave it as is. > > Note that I stopped at your probe_resource() patch -- I already told > you I won't merge that in its current form because I think the > interface you propose is too complicated. ok, let me check if i could simplify it more. > > Let me know what series you'd like me to work on next, and send the > current patches to the list. Maybe for-pci-res-alloc could be moved forwarded, then for-pci-busn-alloc for-pci-root-bus-hotplug for-pci-for-each-res-addon Yinghai -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/