diff options
| author | Jason Gunthorpe | 2018-08-16 21:08:18 +0200 |
|---|---|---|
| committer | Jason Gunthorpe | 2018-08-16 21:12:00 +0200 |
| commit | 89982f7ccee2fcd8fea7936b81eec6defbf0f131 (patch) | |
| tree | fc553c8d008d24595ad7de0ea0f3b56f656da27c /drivers/isdn/hardware/mISDN/netjet.c | |
| parent | RDMA/hns: Fix usage of bitmap allocation functions return values (diff) | |
| parent | Linux 4.18 (diff) | |
| download | kernel-qcow2-linux-89982f7ccee2fcd8fea7936b81eec6defbf0f131.tar.gz kernel-qcow2-linux-89982f7ccee2fcd8fea7936b81eec6defbf0f131.tar.xz kernel-qcow2-linux-89982f7ccee2fcd8fea7936b81eec6defbf0f131.zip | |
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>
Diffstat (limited to 'drivers/isdn/hardware/mISDN/netjet.c')
0 files changed, 0 insertions, 0 deletions