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 <wangyijing@xxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
