Re: [PATCH 00/21] PCI: use busn_res to replace bus secondary/subordinate

[Bjorn Helgaas]

On Thu, May 17, 2012 at 8:13 PM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote:
> On Thu, May 17, 2012 at 3:19 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> 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.

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.

Let me know what series you'd like me to work on next, and send the
current patches to the list.

Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/