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

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

[Stephen Rothwell]

Hi Doug,

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

  drivers/infiniband/hw/hfi1/hfi.h

between commit:

  21c433a74b6b ("IB/hfi1: Use pcie_flr() instead of duplicating it")

from the pci tree and commit:

  f4cd87652919 ("IB/hfi1: Name function prototype parameters")

from the rdma 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/infiniband/hw/hfi1/hfi.h
index 14063bd30c2a,509df984a09f..000000000000
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@@ -1821,13 -1815,15 +1815,14 @@@ void hfi1_verbs_unregister_sysfs(struc
  /* Hook for sysfs read of QSFP */
  int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len);
  
- int hfi1_pcie_init(struct pci_dev *, const struct pci_device_id *);
- void hfi1_pcie_cleanup(struct pci_dev *);
- int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *);
+ int hfi1_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent);
+ void hfi1_pcie_cleanup(struct pci_dev *pdev);
+ int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev);
  void hfi1_pcie_ddcleanup(struct hfi1_devdata *);
- int pcie_speeds(struct hfi1_devdata *);
- void request_msix(struct hfi1_devdata *, u32 *, struct hfi1_msix_entry *);
- void hfi1_enable_intx(struct pci_dev *);
 -void hfi1_pcie_flr(struct hfi1_devdata *dd);
+ int pcie_speeds(struct hfi1_devdata *dd);
+ void request_msix(struct hfi1_devdata *dd, u32 *nent,
+ 		  struct hfi1_msix_entry *entry);
+ void hfi1_enable_intx(struct pci_dev *pdev);
  void restore_pci_variables(struct hfi1_devdata *dd);
  int do_pcie_gen3_transition(struct hfi1_devdata *dd);
  int parse_platform_config(struct hfi1_devdata *dd);

Re: linux-next: manual merge of the rdma tree with the pci tree

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 1367 bytes --]

On 5/4/2017 8:19 PM, Stephen Rothwell wrote:
> Hi Doug,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   drivers/infiniband/hw/hfi1/hfi.h
> 
> between commit:
> 
>   21c433a74b6b ("IB/hfi1: Use pcie_flr() instead of duplicating it")
> 
> from the pci tree and commit:
> 
>   f4cd87652919 ("IB/hfi1: Name function prototype parameters")
> 
> from the rdma 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.
> 

This is not unexpected entirely, only unexpected in that the PCI tree
hasn't been merged yet ;-).  The first commit was part of a series that
was mainly a PCI series that just touched hfi1, so it's entirely
understandable that it went through the PCI tree and something in my
tree might happen, as it were, to touch the same area.  Your fix was
fine and I'm sure Linus can sort the same thing out.  Thanks ;-)

-- 
Doug Ledford <dledford@redhat.com>
    GPG Key ID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD


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