]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2012 01:51:32 +0000 (18:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2012 01:51:32 +0000 (18:51 -0700)
commite165e3a5a41d32270a8e756df052292d7e38f6af
treebf48a0ea86b578ba7f8bec61ebe6565f4b36f061
parenta96fc2c13f4af42bb53f12533525616515fea650
parent3fc0c3d8a3fb60a35bd61830b1d0246421b55f67
Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull infiniband fix from Roland Dreier:
 "Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on
  non-mlx4 hardware."

* tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srpt: Set srq_type to IB_SRQT_BASIC