git.maquefel.me Git - linux.git/commit

author	Jason Gunthorpe <jgg@nvidia.com>
	Thu, 18 Feb 2021 15:17:24 +0000 (11:17 -0400)
committer	Jason Gunthorpe <jgg@nvidia.com>
	Thu, 18 Feb 2021 15:19:29 +0000 (11:19 -0400)
commit	7289e26f395b583f68b676d4d12a0971e4f6f65c
tree	99f8abbb112a3144094e0082dd446439b930beea	tree \| snapshot
parent	ed408529679737a9a7ad816c8de5d59ba104bb11	commit \| diff
parent	f40ddce88593482919761f74910f42f4b84c004b	commit \| diff

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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/infiniband/hw/hns/hns_roce_device.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/hns_roce_qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rxe/rxe_net.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rxe/rxe_resp.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history