diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-10 21:31:29 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 21:31:29 +0300 |
| commit | 320438301b85038e995b5a40a24c43cbc0ed4909 (patch) | |
| tree | 76e9147350dfc759e30d0e3e3283a010dd7cb1cb /include/linux | |
| parent | 913cc67159bc85a96d94df301ca39c1b2c540dca (diff) | |
| parent | ac3a949fb2fff36bebdc4fab90567ed349ea7245 (diff) | |
| parent | 0b36658ca8b15b55eca2806ce7d5542ec26ee686 (diff) | |
| download | linux-320438301b85038e995b5a40a24c43cbc0ed4909.tar.xz | |
Merge branches '32bit_lid' and 'irq_affinity' into k.o/merge-test
Conflicts:
drivers/infiniband/hw/mlx5/main.c - Both add new code
include/rdma/ib_verbs.h - Both add new code
Signed-off-by: Doug Ledford <dledford@redhat.com>