diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-28 16:45:14 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-28 16:45:14 -0800 |
commit | 1e60508c3f4dc0be629e5b70b31d42c0d053109b (patch) | |
tree | 88cce925490748ab96e68148d919003eb13322c6 /drivers/dma/sirf-dma.c | |
parent | 8513342170278468bac126640a5d2d12ffbff106 (diff) | |
parent | f41647ef06536199d3366530da050b411546979d (diff) | |
download | linux-1e60508c3f4dc0be629e5b70b31d42c0d053109b.tar.bz2 |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
"Three late 4.4-rc fixes.
The first two were very small in terms of number of lines, the third
is more lines of change than I like this late in the cycle, but there
are positive test results from Avagotech and from my own test setup
with the target hardware, and given the problem was a 100% failure
case, I sent it through.
- A previous patch updated the mlx4 driver to use vmalloc when there
was not enough memory to get a contiguous region large enough for
our needs, so we need kvfree() whenever we free that item. We
missed one place, so fix that now.
- A previous patch added code to match incoming packets against a
specific device, but failed to compensate for devices that have
both InfiniBand and Ethernet ports. Fix that.
- Under certain vlan conditions, the ocrdma driver would fail to
bring up any vlan interfaces and would print out a circular locking
failure. Fix that"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
RDMA/be2net: Remove open and close entry points
RDMA/ocrdma: Depend on async link events from CNA
RDMA/ocrdma: Dispatch only port event when port state changes
RDMA/ocrdma: Fix vlan-id assignment in qp parameters
IB/mlx4: Replace kfree with kvfree in mlx4_ib_destroy_srq
IB/cma: cma_match_net_dev needs to take into account port_num
Diffstat (limited to 'drivers/dma/sirf-dma.c')
0 files changed, 0 insertions, 0 deletions