Jason Gunthorpe e7996a9a77 Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ...

To resolve conflicts in:
 drivers/infiniband/hw/mlx5/main.c
 drivers/infiniband/hw/mlx5/qp.c

From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.

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

2018-01-30 09:30:00 -07:00

..

cmd.h

…

cq.h

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-11-15 14:54:53 -08:00

device.h

net/mlx5: Set software owner ID during init HCA

2018-01-08 11:42:20 -07:00

doorbell.h

…

driver.h

Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2018-01-30 09:30:00 -07:00

fs.h

…

mlx5_ifc_fpga.h

…

mlx5_ifc.h

Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2018-01-30 09:30:00 -07:00

port.h

net/mlx5: QPTS and QPDPM register firmware command support

2017-11-04 21:26:21 -07:00

qp.h

net/mlx5: Add DCT command interface

2018-01-08 11:38:49 -07:00

srq.h

…

transobj.h

…

vport.h

{net, IB}/mlx5: Manage port association for multiport RoCE

2018-01-08 11:42:22 -07:00