diff options
| author | Jason Gunthorpe <[email protected]> | 2021-02-18 15:17:24 +0000 |
|---|---|---|
| committer | Jason Gunthorpe <[email protected]> | 2021-02-18 15:19:29 +0000 |
| commit | 7289e26f395b583f68b676d4d12a0971e4f6f65c (patch) | |
| tree | 99f8abbb112a3144094e0082dd446439b930beea /tools/perf/scripts/python/flamegraph.py | |
| parent | RDMA/rtrs-srv: Do not pass a valid pointer to PTR_ERR() (diff) | |
| parent | Linux 5.11 (diff) | |
| download | kernel-7289e26f395b583f68b676d4d12a0971e4f6f65c.tar.gz kernel-7289e26f395b583f68b676d4d12a0971e4f6f65c.zip | |
Merge tag 'v5.11' into rdma.git for-next
Linux 5.11
Merged to resolve conflicts with RDMA rc commits
- drivers/infiniband/sw/rxe/rxe_net.c
The final logic is to call rxe_get_dev_from_net() again with the master
netdev if the packet was rx'd on a vlan. To keep the elimination of the
local variables requires a trivial edit to the code in -rc
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jason Gunthorpe <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/flamegraph.py')
0 files changed, 0 insertions, 0 deletions