| Message ID | 20190823123507.197cac03@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the pci tree | expand |
diff --cc drivers/pci/Kconfig index 232042722261,c313de96a357..000000000000 --- a/drivers/pci/Kconfig diff --cc drivers/pci/controller/pci-hyperv.c index 3a56de6b2ec2,9c93ac2215b7..000000000000 --- a/drivers/pci/controller/pci-hyperv.c
Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/pci/Kconfig drivers/pci/controller/pci-hyperv.c between commit: f58ba5e3f686 ("PCI: pci-hyperv: Fix build errors on non-SYSFS config") 44b1ece783ff ("PCI: hv: Detect and fix Hyper-V PCI domain number collision") from the pci tree and commit: 348dd93e40c1 ("PCI: hv: Add a Hyper-V PCI interface driver for software backchannel interface") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.