diff options
author | Doug Ledford <dledford@redhat.com> | 2016-12-14 20:44:47 +0100 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 20:44:47 +0100 |
commit | 9032ad78bb58f2567fc95125ee69cde7b74c0a21 (patch) | |
tree | c92982d00aac2312e5c3a11d0ec7fbebab221fc3 /include/uapi/rdma/mlx5-abi.h | |
parent | Merge branch 'mlx' into merge-test (diff) | |
parent | IB/mlx4: fix improper return value (diff) | |
parent | qede: fix general protection fault may occur on probe (diff) | |
parent | nvmet_rdma: log the connection reject message (diff) | |
parent | IB/rxe: Hold refs when running tasklets (diff) | |
parent | IB/srp: Make writing the add_target sysfs attr interruptible (diff) | |
download | linux-9032ad78bb58f2567fc95125ee69cde7b74c0a21.tar.xz linux-9032ad78bb58f2567fc95125ee69cde7b74c0a21.zip |
Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test