| commit | 4166fb64593514ad920b7dbd290e0a934b37d24a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 13 Apr 2012 01:51:32 +0000 (12 18:51 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 13 Apr 2012 01:51:32 +0000 (12 18:51 -0700) | ||
| tree | bf48a0ea86b578ba7f8bec61ebe6565f4b36f061 | treesnapshot (tar.gz zip) |
| parent | e4757cab4cff01e9c47b14376be7438694032c3c | commitdiff |
| parent | 6f3603367b8f7c34598fdfc1058622e0e1951e98 | commitdiff |
Merge tag 'srpt-srq-type' of git://git./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
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