diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-22 03:36:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-22 03:36:23 +0300 |
| commit | 83ee4121b18e912cd54800a83728b13c554fbc53 (patch) | |
| tree | 52a40097adcaa6f9b2a90f3326f1f73520aa95ec /fs/ext4/inode.c | |
| parent | 97793a81b5271c4c433851814aaf6d1c2a2c2ae6 (diff) | |
| parent | c07678bb01374c510b0f6d4a3832c28ba33e9613 (diff) | |
| download | linux-83ee4121b18e912cd54800a83728b13c554fbc53.tar.xz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull infiniband/rdma fixes from Doug Ledford:
"This should hopefully be the last request for 4.1-rc for the RDMA
stack. It contains some late ocrdma fixes that I'm including because
they are small and self contained. It also contains two bug fixes
that are simple and easily verified.
Summary:
- a number of small, well contained bug fixes for ocrdma driver
- a simple fix for the connection negotiation sequence on IB
- fix for broken AF_IB address on UD queue pair support"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
IB/cma: Fix broken AF_IB UD support
ib/cm: Change reject message type when destroying cm_id
RDMA/ocrdma: Update ocrdma version number
RDMA/ocrdma: Fail connection for MTU lesser than 512
RDMA/ocrdma: Fix dmac resolution for link local address
RDMA/ocrdma: Prevent allocation of DPP PDs if FW doesnt support it
RDMA/ocrdma: Fix the request length for RDMA_QUERY_QP mailbox command to FW.
RDMA/ocrdma: Use VID 0 if PFC is enabled and vlan is not configured
RDMA/ocrdma: Fix QP state transition in destroy_qp
RDMA/ocrdma: Report EQ full fatal error
RDMA/ocrdma: Fix EQ destroy failure during driver unload
Diffstat (limited to 'fs/ext4/inode.c')
0 files changed, 0 insertions, 0 deletions