git.osdn.net Git - android-x86/kernel.git/commit

(root) / android-x86 / 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	d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c
tree	8ce9d1f42907ff6b9455b155ca47ebae143f9a1b	tree \| snapshot
parent	320438301b85038e995b5a40a24c43cbc0ed4909	commit \| diff
parent	db14dff1743e4cd3d840950ad8d735b8957aaf6a	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

kernel

RSS Atom

About OSDN

Find Software

Develop Software

Help

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