Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2016 06:42:22 +0000 (15:42 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2016 06:42:22 +0000 (15:42 +0900)
commit0a9cb4815b91378bc7e8a7cda781ee50325bdd54
tree7f02d303e114a2e4f6af218c8d9af0950f1c092a
parent1a86f944c7f2b22a81f9a1e6a890be0db5d2444a
parent8e0e7aedadb877d91a6e66611464165c969bc0a9
Merge tag 'for-linus' of git://git./linux/kernel/git/dledford/rdma

Pull rdma fixes from Doug Ledford:
 "Round three of 4.7 rc fixes:
   - two fixes for hfi1
   - two fixes for i40iw
   - one omission correction in the port table counter arrays"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  i40iw: Enable remote access rights for stag allocation
  i40iw: do not print unitialized variables in error message
  IB core: Add port_xmit_wait counter
  IB/hfi1: Fix sleep inside atomic issue in init_asic_data
  IB/hfi1: Correct issues with sc5 computation