linux_dsm_epyc7002/include/linux/mlx5
Jason Gunthorpe 0a3173a5f0 Merge branch 'linus/master' into rdma.git for-next
rdma.git merge resolution for the 4.19 merge window

Conflicts:
 drivers/infiniband/core/rdma_core.c
   - Use the rdma code and revise with the new spelling for
     atomic_fetch_add_unless
 drivers/nvme/host/rdma.c
   - Replace max_sge with max_send_sge in new blk code
 drivers/nvme/target/rdma.c
   - Use the blk code and revise to use NULL for ib_post_recv when
     appropriate
   - Replace max_sge with max_recv_sge in new blk code
 net/rds/ib_send.c
   - Use the net code and revise to use NULL for ib_post_recv when
     appropriate

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2018-08-16 14:21:29 -06:00
..
accel.h
cmd.h
cq.h
device.h net/mlx5: Rename modify/query_vport state related enums 2018-08-08 19:34:54 -07:00
doorbell.h
driver.h Merge branch 'linus/master' into rdma.git for-next 2018-08-16 14:21:29 -06:00
eswitch.h net/mlx5: E-Switch, Avoid setup attempt if not being e-switch manager 2018-06-26 15:26:29 -07:00
fs_helpers.h
fs.h Merge branch 'linus/master' into rdma.git for-next 2018-08-16 14:21:29 -06:00
mlx5_ifc_fpga.h net/mlx5: Accel, add TLS rx offload routines 2018-07-16 00:13:11 -07:00
mlx5_ifc.h Merge branch 'linus/master' into rdma.git for-next 2018-08-16 14:21:29 -06:00
port.h
qp.h
srq.h
transobj.h
vport.h net/mlx5: Remove unused mlx5_query_vport_admin_state 2018-08-08 19:34:55 -07:00