diff options
| author | Doug Ledford <dledford@redhat.com> | 2019-02-09 12:54:04 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-02-09 12:54:04 -0500 |
| commit | 82771f20338fcdeb0a38319c7a72f1f36df39a7a (patch) | |
| tree | 532f865fff8bb8e17ec5b743c57bd5c5ec07fd2e /certs/.gitignore | |
| parent | ecb53febfcad565366762b7413b03452874643db (diff) | |
| parent | 416fbc1bbaa51742f7c49ff0578a594c2082c73b (diff) | |
| download | linux-82771f20338fcdeb0a38319c7a72f1f36df39a7a.tar.bz2 | |
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>
Diffstat (limited to 'certs/.gitignore')
0 files changed, 0 insertions, 0 deletions