Jason Gunthorpe 89982f7cce Merge tag 'v4.18' into rdma.git for-next ...

Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

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

2018-08-16 13:12:00 -06:00

..

rdmavt

RDMA/providers: Fix return value from create_srq callbacks

2018-07-30 20:29:45 -06:00

rxe

Merge tag 'v4.18' into rdma.git for-next

2018-08-16 13:12:00 -06:00

Makefile

Soft RoCE driver

2016-08-04 11:13:12 -04:00