diff options
| author | Doug Ledford <dledford@redhat.com> | 2018-02-22 22:27:20 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2018-02-22 22:27:20 -0500 |
| commit | 4bb46608ed78758c89c77ae5d1163dce3df95950 (patch) | |
| tree | fe1691e368ea0633ece93d790cd7f90f6afb91f2 /include/uapi/rdma/ib_user_cm.h | |
| parent | f76a5c75d93b0e9c14aa4d4422e7e7f8382a7ecb (diff) | |
| parent | f45765872e7aae7b81feb3044aaf9886b21885ef (diff) | |
Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next
There is a 14 patch series waiting to come into for-next that has a
dependecy on code submitted into this kernel's for-rc series. So, merge
the for-rc branch into the current for-next in order to make the patch
series apply cleanly.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/uapi/rdma/ib_user_cm.h')
0 files changed, 0 insertions, 0 deletions