]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2015 03:04:11 +0000 (20:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2015 03:04:11 +0000 (20:04 -0700)
commitdc847d5b4aa852c41b56c21bdc759fee13cc8f68
tree7071b8f5b8a2594d41ec82aab3d50d117c8c7fe3
parent2673ee565f10e0f2fdcf61f7a715e6b4ac2497dc
parente116a64fab650aed3d7b9b4db0b59c07f361bc9f
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull rdma fixes from Doug Ledford:
 "The new hfi1 driver in staging/rdma has had a number of fixup patches
  since being added to the tree.  This is the first batch of those fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/hfi: Properly set permissions for user device files
  IB/hfi1: mask vs shift confusion
  IB/hfi1: clean up some defines
  IB/hfi1: info leak in get_ctxt_info()
  IB/hfi1: fix a locking bug
  IB/hfi1: checking for NULL instead of IS_ERR
  IB/hfi1: fix sdma_descq_cnt parameter parsing
  IB/hfi1: fix copy_to/from_user() error handling
  IB/hfi1: fix pstateinfo from returning improperly byteswapped value