diff options
| author | Linus Torvalds <[email protected]> | 2021-01-28 17:27:26 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-01-28 17:27:26 +0000 |
| commit | b0dfa64dcdc3e168e3600a330762c294328741d5 (patch) | |
| tree | 03388040a45ceeae9b57b2ef1e30d9aa4c1cd9ae /net/switchdev/switchdev.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid... (diff) | |
| parent | Revert "RDMA/rxe: Remove VLAN code leftovers from RXE" (diff) | |
| download | kernel-b0dfa64dcdc3e168e3600a330762c294328741d5.tar.gz kernel-b0dfa64dcdc3e168e3600a330762c294328741d5.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"Several recent regressions and some bug fixes:
- Typo corrupting the max_recv_sge for cxgb4
- Regression from re-using kernel enums as a HW AbI in vmw_pvrdma
- Sleeping inside a spinlock in hns
- Revert the attempt to fix devlink deadlocks as the fix is more buggy
- Typo in sysfs_emit_at conversions
- Revert the removal of VLAN support in rxe"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
Revert "RDMA/rxe: Remove VLAN code leftovers from RXE"
RDMA/usnic: Fix misuse of sysfs_emit_at
Revert "RDMA/mlx5: Fix devlink deadlock on net namespace deletion"
RDMA/hns: Use mutex instead of spinlock for ida allocation
RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC
RDMA/cxgb4: Fix the reported max_recv_sge value
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions