mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
7289e26f39
-----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmAppPgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGeXYH/imZPBd4A1jIMehN 5HV2A53Z+MXmmaMuGj9X1KV6vsf55/xB+IhOoFdtRAIsO8c2yYSCO8i4+4R0XfYA +/YFJeq672rojQnmh6XbpR8dugaAV7CUHy6n7KDsyvtT6EOCpwFSwkOb4X3tBRX6 TlYgm2d/xgV/wRHSgLVugK0MdFCLMAnyb7mkPfar9QrMgG1BiDKLq07xmwnS23On TkqpJ9yZ/rJpUrrUqQYPShSO/FmA+fSfWs0CDv7EIrJ40LUScD6PZxSHWTIHtjLk E4jFda6wuqLRVWsBwaBzUIdD0zk7X5quHRzEpbC5ga16SK6yrWvE5YJJXCguIEuZ f3FMRYs= =CAjn -----END PGP SIGNATURE----- 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/20210210131542.215ea67c@canb.auug.org.au Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
||
|---|---|---|
| .. | ||
| hns_roce_ah.c | ||
| hns_roce_alloc.c | ||
| hns_roce_cmd.c | ||
| hns_roce_cmd.h | ||
| hns_roce_common.h | ||
| hns_roce_cq.c | ||
| hns_roce_db.c | ||
| hns_roce_device.h | ||
| hns_roce_hem.c | ||
| hns_roce_hem.h | ||
| hns_roce_hw_v1.c | ||
| hns_roce_hw_v1.h | ||
| hns_roce_hw_v2.c | ||
| hns_roce_hw_v2.h | ||
| hns_roce_hw_v2_dfx.c | ||
| hns_roce_main.c | ||
| hns_roce_mr.c | ||
| hns_roce_pd.c | ||
| hns_roce_qp.c | ||
| hns_roce_restrack.c | ||
| hns_roce_srq.c | ||
| Kconfig | ||
| Makefile | ||