Files
kernel_arpi/include/linux
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
..
2018-07-22 11:51:30 -07:00
2018-06-15 18:10:01 -03:00
2018-06-15 18:10:01 -03:00
2018-07-03 18:33:19 -04:00
2018-06-18 11:22:54 -06:00
2018-06-21 17:39:18 +02:00
2018-06-15 07:55:25 +09:00
2018-06-29 08:48:06 -06:00