aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-08-10 14:31:29 -0400
committerDoug Ledford <dledford@redhat.com>2017-08-10 14:31:29 -0400
commit320438301b85038e995b5a40a24c43cbc0ed4909 (patch)
tree76e9147350dfc759e30d0e3e3283a010dd7cb1cb /include
parent913cc67159bc85a96d94df301ca39c1b2c540dca (diff)
parentac3a949fb2fff36bebdc4fab90567ed349ea7245 (diff)
parent0b36658ca8b15b55eca2806ce7d5542ec26ee686 (diff)
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>

Privacy Policy