| commit | 89982f7ccee2fcd8fea7936b81eec6defbf0f131 | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@mellanox.com> | Thu Aug 16 13:08:18 2018 -0600 |
| committer | Jason Gunthorpe <jgg@mellanox.com> | Thu Aug 16 13:12:00 2018 -0600 |
| tree | fc553c8d008d24595ad7de0ea0f3b56f656da27c | |
| parent | a1ceeca679dccc492235f0f629d9e9f7b3d51ca8 [diff] | |
| parent | 94710cac0ef4ee177a63b5227664b38c95bbf703 [diff] |
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>