diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-22 21:04:11 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-22 21:04:11 +0100 |
commit | a16152c897d74abcca15c120c746264ac4b3bfd1 (patch) | |
tree | 26bbffec4dfcb3bb7fea89f9111c0b49f61c395d /ipc | |
parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | IB/mlx4: Add support for the port info class for RoCE ports (diff) | |
download | linux-a16152c897d74abcca15c120c746264ac4b3bfd1.tar.xz linux-a16152c897d74abcca15c120c746264ac4b3bfd1.zip |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
"One ocrdma fix:
- The new CQ API support was added to ocrdma, but they got the arming
logic wrong, so without this, transfers eventually fail when they
fail to arm the interrupt properly under load
Two related fixes for mlx4:
- When we added the 64bit extended counters support to the core IB
code, they forgot to update the RoCE side of the mlx4 driver (the
IB side they properly updated).
I debated whether or not to include these patches as they could be
considered feature enablement patches, but the existing code will
blindy copy the 32bit counters, whether any counters were requested
at all (a bug).
These two patches make it (a) check to see that counters were
requested and (b) copy the right counters (the 64bit support is
new, the 32bit is not). For that reason I went ahead and took
them"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
IB/mlx4: Add support for the port info class for RoCE ports
IB/mlx4: Add support for extended counters over RoCE ports
RDMA/ocrdma: Fix arm logic to align with new cq API
Diffstat (limited to 'ipc')
0 files changed, 0 insertions, 0 deletions