git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Doug Ledford <dledford@redhat.com>
	Thu, 10 Aug 2017 18:31:29 +0000 (14:31 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Thu, 10 Aug 2017 18:31:29 +0000 (14:31 -0400)
commit	4815aa4437d46c3bb75ce1b383fd90d6ed9bca92
tree	76e9147350dfc759e30d0e3e3283a010dd7cb1cb	tree \| snapshot
parent	6213dad149172155198c4bedc785f72d53878595	commit \| diff
parent	4df93647bba442c1429e6bdf75bafd69c5704d49	commit \| diff
parent	a948d24c8127d060f397705f57f09b8bc17f4b00	commit \| 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>

Linux Kernel Source Tree.

RSS Atom

drivers/infiniband/core/uverbs_cmd.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/infiniband/hw/hfi1/mad.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eq.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	diff3 \|	blob \| history