Merge tag 'v5.2-rc6' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Sat, 29 Jun 2019 00:18:23 +0000 (21:18 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Sat, 29 Jun 2019 00:18:23 +0000 (21:18 -0300)
commit371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4
tree9442ae9b22e3cf24fbe8dcefae8862a3e4e05629
parent10dcc7448e9ea49488a38bca7551de1a9da06ad9
parent4b972a01a7da614b4796475f933094751a295a2f
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
drivers/infiniband/Kconfig
drivers/infiniband/core/cq.c
drivers/infiniband/core/device.c
drivers/infiniband/core/mr_pool.c
drivers/infiniband/core/rw.c
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/uverbs_std_types_cq.c
drivers/infiniband/core/uverbs_std_types_mr.c
drivers/infiniband/hw/efa/efa_com_cmd.c
drivers/infiniband/hw/efa/efa_verbs.c
drivers/infiniband/hw/hfi1/pio.c
drivers/infiniband/hw/hfi1/rc.c
drivers/infiniband/hw/hfi1/tid_rdma.c
drivers/infiniband/hw/hfi1/verbs.c
drivers/infiniband/hw/hns/Kconfig
drivers/infiniband/hw/hns/Makefile
drivers/infiniband/hw/hns/hns_roce_hw_v1.c
drivers/infiniband/hw/mlx5/ib_rep.c
drivers/infiniband/hw/mlx5/ib_rep.h
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/qib/qib_verbs.c
drivers/infiniband/sw/rdmavt/mr.c
drivers/infiniband/sw/rdmavt/qp.c
drivers/infiniband/ulp/ipoib/Kconfig
drivers/infiniband/ulp/isert/ib_isert.c
drivers/infiniband/ulp/srp/ib_srp.c
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
drivers/net/ethernet/mellanox/mlx5/core/ecpf.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/nvme/host/rdma.c
include/linux/mlx5/eswitch.h
include/net/devlink.h
include/rdma/ib_verbs.h
include/rdma/mr_pool.h
include/rdma/rw.h
net/core/devlink.c