diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-10 23:11:08 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-10 23:11:08 (GMT) |
| commit | 721675fcf277cfd345117d3abae1c5590c5fdfd4 (patch) | |
| tree | ce22592a9f0cca568fd1edae0817b95e709a149c /drivers/macintosh | |
| parent | 74c7b2af37ad431c3b69961a5cdbd0a92292c92a (diff) | |
| parent | 7425f410ca6cffe81400906286f80e8e15d9b301 (diff) | |
| download | linux-721675fcf277cfd345117d3abae1c5590c5fdfd4.tar.xz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
"A few more minor fixes for rc3:
- One fix to ipoib
- One fix to core sysfs code
- Four patches that resolve an oops found in testing of ocrdma and a
couple other ocrdma issues"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
RDMA/ocrdma: Fixing ocrdma debugfs directory remove
RDMA/ocrdma: Fix pkey_index returned by driver in rq work completion
RDMA/ocrdma: populate max_sge_rd in device attributes
RDMA/ocrdma: Initialize stats resources in the driver before ib device registration.
IB/sysfs: remove unused va_list args
IB/IPoIB: Do not set skb truesize since using one linearskb
Diffstat (limited to 'drivers/macintosh')
0 files changed, 0 insertions, 0 deletions