linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2216 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/Kconfig
index 232042722261,c313de96a357..000000000000
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@@ -181,7 -181,8 +181,8 @@@ config PCI_LABE
  
  config PCI_HYPERV
          tristate "Hyper-V PCI Frontend"
 -        depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64
 +        depends on X86_64 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && SYSFS
+ 	select PCI_HYPERV_INTERFACE
          help
            The PCI device frontend driver allows the kernel to import arbitrary
            PCI devices from a PCI backend to support PCI driver domains.
diff --cc drivers/pci/controller/pci-hyperv.c
index 3a56de6b2ec2,9c93ac2215b7..000000000000
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@@ -2810,9 -3050,11 +3113,14 @@@ static void __exit exit_hv_pci_drv(void
  
  static int __init init_hv_pci_drv(void)
  {
 +	/* Set the invalid domain number's bit, so it will not be used */
 +	set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
 +
+ 	/* Initialize PCI block r/w interface */
+ 	hvpci_block_ops.read_block = hv_read_config_block;
+ 	hvpci_block_ops.write_block = hv_write_config_block;
+ 	hvpci_block_ops.reg_blk_invalidate = hv_register_block_invalidate;
+ 
  	return vmbus_driver_register(&hv_pci_drv);
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]