git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	155075850b44e5a0789262d163d0d4dda48cc8c4
tree	99f8abbb112a3144094e0082dd446439b930beea	tree \| snapshot
parent	d0c99c99ca4106a3671e64a6487c319bcd70a50a	commit \| diff
parent	85e28dbd98d995cf6c7079d7a33e25c4d197c57e	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>

Linux Kernel Source Tree.

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