git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Jason Gunthorpe <jgg@mellanox.com>
	Sat, 29 Jun 2019 00:18:23 +0000 (21:18 -0300)
committer	Jason Gunthorpe <jgg@mellanox.com>
	Sat, 29 Jun 2019 00:18:23 +0000 (21:18 -0300)
commit	371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4
tree	9442ae9b22e3cf24fbe8dcefae8862a3e4e05629	tree \| snapshot
parent	10dcc7448e9ea49488a38bca7551de1a9da06ad9	commit \| diff
parent	4b972a01a7da614b4796475f933094751a295a2f	commit \| diff

Merge tag 'v5.2-rc6' into rdma.git for-next

For dependencies in next patches.

Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

41 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/cq.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/device.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/mr_pool.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/rw.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_std_types_cq.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_std_types_mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/efa/efa_com_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/efa/efa_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/pio.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/tid_rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/hns_roce_hw_v1.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/ib_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/ib_rep.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/isert/ib_isert.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srp/ib_srp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/ecpf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/eswitch.h	diff1 \|	diff2 \|	blob \| history
include/net/devlink.h	diff1 \|	diff2 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	blob \| history
include/rdma/mr_pool.h	diff1 \|	diff2 \|	blob \| history
include/rdma/rw.h	diff1 \|	diff2 \|	blob \| history
net/core/devlink.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/cq.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/device.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/mr_pool.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/rw.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_std_types_cq.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_std_types_mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/efa/efa_com_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/efa/efa_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/pio.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/tid_rdma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hns/hns_roce_hw_v1.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/ib_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/ib_rep.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qib/qib_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/isert/ib_isert.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srp/ib_srp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/ecpf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/eswitch.h	diff1 \|	diff2 \|	blob \| history
include/net/devlink.h	diff1 \|	diff2 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	blob \| history
include/rdma/mr_pool.h	diff1 \|	diff2 \|	blob \| history
include/rdma/rw.h	diff1 \|	diff2 \|	blob \| history
net/core/devlink.c	diff1 \|	diff2 \|	blob \| history