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:34:18 +0000 (14:34 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Thu, 10 Aug 2017 18:34:18 +0000 (14:34 -0400)
commit	9254a99ac24cd091e1301e4e95707aac515e6551
tree	8ce9d1f42907ff6b9455b155ca47ebae143f9a1b	tree \| snapshot
parent	e2d2fe8ffec4e77e00a575036e46a4c11694de5e	commit \| diff
parent	fb1d9ecb964874b787f267944f859850a8a86c0e	commit \| diff

Merge branch 'rdma-netlink' into k.o/merge-test

Conflicts:
include/rdma/ib_verbs.h - Modified a function signature adjacent
to a newly added function signature from a previous merge

Signed-off-by: Doug Ledford <dledford@redhat.com>

drivers/infiniband/core/core_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/infiniband/core/core_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	blob \| history