linux-next: manual merge of the pci tree with Linus' tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/controller/pci-hyperv.c

between commits:

  348dd93e40c1 ("PCI: hv: Add a Hyper-V PCI interface driver for software backchannel interface")
  467a3bb97432 ("PCI: hv: Allocate a named fwnode instead of an address-based one")

from Linus' tree and commit:

  be700103efd1 ("PCI: hv: Detect and fix Hyper-V PCI domain number collision")

from the pci 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.

diff --cc drivers/pci/controller/pci-hyperv.c
index 0ca73c851e0fb,3a56de6b2ec2c..0000000000000
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@@ -2820,7 -2563,7 +2862,8 @@@ static int hv_pci_probe(struct hv_devic
  			const struct hv_vmbus_device_id *dev_id)
  {
  	struct hv_pcibus_device *hbus;
 +	char *name;
+ 	u16 dom_req, dom;
  	int ret;
  
  	/*
@@@ -3058,11 -2810,9 +3121,14 @@@ static void __exit exit_hv_pci_drv(void
  
  static int __init init_hv_pci_drv(void)
  {
 +	/* 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;
 +
+ 	/* Set the invalid domain number's bit, so it will not be used */
+ 	set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
+ 
  	return vmbus_driver_register(&hv_pci_drv);
  }
  

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