On Fri, May 18, 2012 at 10:38 PM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote: > On Fri, May 18, 2012 at 4:32 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> 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 <bhelgaas@xxxxxxxxxx> > Fri, 18 May 2012 17:35:50 +0000 (11:35 -0600) > committer Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > 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 <yinghai@xxxxxxxxxx> > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > 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-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
