OSDN Git Service

Merge branch 'wip/dl-for-next' into for-next
authorDoug Ledford <dledford@redhat.com>
Sat, 9 Feb 2019 17:54:04 +0000 (12:54 -0500)
committerDoug Ledford <dledford@redhat.com>
Sat, 9 Feb 2019 17:54:04 +0000 (12:54 -0500)
commit82771f20338fcdeb0a38319c7a72f1f36df39a7a
tree532f865fff8bb8e17ec5b743c57bd5c5ec07fd2e
parentecb53febfcad565366762b7413b03452874643db
parent416fbc1bbaa51742f7c49ff0578a594c2082c73b
Merge branch 'wip/dl-for-next' into for-next

Due to concurrent work by myself and Jason, a normal fast forward merge
was not possible.  This brings in a number of hfi1 changes, mainly the
hfi1 TID RDMA support (roughly 10,000 LOC change), which was reviewed
and integrated over a period of days.

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/sw/rdmavt/qp.c