From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 May 2017 03:07:29 +0000 (-0700)
Subject: Merge tags 'for-linus' and 'for-next' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~5649
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3341713c67d5eae5c68bab30add97e9f9ecfafa5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tags 'for-linus' and 'for-next' of git://git./linux/kernel/git/dledford/rdma

Pull more rdma updates from Doug Ledford:
 "As mentioned in my first pull request, this is the subsequent pull
  requests I had. This is all I have, and in fact this cleans out the
  RDMA subsystem's entire patchworks queue of kernel changes that are
  ready to go (well, it did for the weekend anyway, a few new patches
  are in, but they'll be coming during the -rc cycle).

  The first tag contains a single patch that would have conflicted if
  taken from my tree or DaveM's tree as it needed our trees merged to
  come cleanly.

  The second tag contains the patch series from Intel plus three other
  stragllers that came in late last week. I took them because it allowed
  me to legitimately claim that the RDMA patchworks queue was, for a
  short time, 100% cleared of all waiting kernel patches, woohoo! :-).

  I have it under my for-next tag, so it did get 0day and linux- next
  over the end of last week, and linux-next did show one minor conflict.

  Summary:

  'for-linus' tag:
   - mlx5/IPoIB fixup patch

  'for-next' tag:
   - the hfi1 15 patch set that landed late
   - IPoIB get_link_ksettings which landed late because I asked for a
     respin
   - one late rxe change
   - one -rc worthy fix that's in early"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/mlx5: Enable IPoIB acceleration

* tag 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  rxe: expose num_possible_cpus() cnum_comp_vectors
  IB/rxe: Update caller's CRC for RXE_MEM_TYPE_DMA memory type
  IB/hfi1: Clean up on context initialization failure
  IB/hfi1: Fix an assign/ordering issue with shared context IDs
  IB/hfi1: Clean up context initialization
  IB/hfi1: Correctly clear the pkey
  IB/hfi1: Search shared contexts on the opened device, not all devices
  IB/hfi1: Remove atomic operations for SDMA_REQ_HAVE_AHG bit
  IB/hfi1: Use filedata rather than filepointer
  IB/hfi1: Name function prototype parameters
  IB/hfi1: Fix a subcontext memory leak
  IB/hfi1: Return an error on memory allocation failure
  IB/hfi1: Adjust default eager_buffer_size to 8MB
  IB/hfi1: Get rid of divide when setting the tx request header
  IB/hfi1: Fix yield logic in send engine
  IB/hfi1, IB/rdmavt: Move r_adefered to r_lock cache line
  IB/hfi1: Fix checks for Offline transient state
  IB/ipoib: add get_link_ksettings in ethtool
---

3341713c67d5eae5c68bab30add97e9f9ecfafa5
diff --cc drivers/infiniband/hw/hfi1/hfi.h
index 14063bd30c2a,f06674317abf,509df984a09f..da322e6668cc
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@@@ -1821,13 -1821,14 -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 *);
 - void hfi1_pcie_flr(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);