]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecb53fe 416fbc1)
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)
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>
1  2 
drivers/infiniband/sw/rdmavt/qp.c patch | diff1 | diff2 | blob | history

diff --cc drivers/infiniband/sw/rdmavt/qp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.