Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932161Ab2EUUGr (ORCPT ); Mon, 21 May 2012 16:06:47 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:59529 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750945Ab2EUUGp convert rfc822-to-8bit (ORCPT ); Mon, 21 May 2012 16:06:45 -0400 MIME-Version: 1.0 In-Reply-To: References: <1336422606-4244-1-git-send-email-yinghai@kernel.org> From: Bjorn Helgaas Date: Mon, 21 May 2012 14:06:23 -0600 Message-ID: Subject: Re: [PATCH 00/21] PCI: use busn_res to replace bus secondary/subordinate To: Yinghai Lu 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 X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1833 Lines: 45 On Fri, May 18, 2012 at 10:38 PM, Yinghai Lu wrote: > On Fri, May 18, 2012 at 4:32 PM, Bjorn Helgaas wrote: > 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. Oops, sorry, I squashed two patches into one (no point in two patches that (1) add A and (2) clean up A), and I must have screwed up the author then. I fixed it in my tree. I also changed the branch name to "for-3.6" to make it more obvious that the changes there are targeted for the 3.6 merge window, not for 3.5. After Linus pulls my current "next" branch into 3.5-rcX, I'll move the for-3.6 stuff to the "next" branch as usual. >> 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 OK, just send your current patches to the list so everybody has a chance to see them. Bjorn -- 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/