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

..

ib_isert.c

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

ib_isert.h

iser-target: avoid reinitializing rdma contexts for isert commands

2017-12-18 16:12:18 -07:00

Kconfig

treewide: Fix typo in Kconfig

2013-10-14 15:23:02 +02:00

Makefile

iser-target: Add iSCSI Extensions for RDMA (iSER) target driver

2013-04-25 01:09:41 -07:00