diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-06 11:25:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-06 11:25:55 -0700 |
commit | d109d83fc8c325dd92d0c3c0a2db2048699773be (patch) | |
tree | 1d6da04a4a48f753bb280f91a9c211c6c8b4abf7 /drivers/block/brd.c | |
parent | bf2db0b9f5808fa5b78141b68d55ec630bf06313 (diff) | |
parent | 789f903fd75036f937409a9a1616a5a5e5cc5bae (diff) |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
"This is a pretty small pull request. Only 6 patches in total. There
are no outstanding -rc patches on the mailing list after this pull
request, so only if some new issues are discovered in the remainder of
the rc cycles will you hear from me again.
Summary:
- a fix for iwpm netlink usage
- a fix for error unwinding in mlx5
- two fixes to vlan handling in qedr
- a couple small i40iw fixes"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
i40iw: Fix port number for query QP
i40iw: Add missing memory barriers
RDMA/qedr: Parse vlan priority as sl
RDMA/qedr: Parse VLAN ID correctly and ignore the value of zero
IB/mlx5: Fix label order in error path handling
RDMA/iwpm: Properly mark end of NL messages
Diffstat (limited to 'drivers/block/brd.c')
0 files changed, 0 insertions, 0 deletions