git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	Doug Ledford <dledford@redhat.com>
	Fri, 18 Aug 2017 18:10:23 +0000 (14:10 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Fri, 18 Aug 2017 18:10:23 +0000 (14:10 -0400)
commit	d3cf4d9915c4fb60aeef580973aa77420e600746
tree	101f4c94eaa9d4c11673a41a7e5f2280fa59227d	tree \| snapshot (tar.gz zip)
parent	3e5f0881f17525e3b49835947a5e0cf2d681b1e2	commit \| diff
parent	9d6fd7aca149e2c95915447f76b125dc2123db45	commit \| diff

Merge branch 'misc' into k.o/for-next

Conflicts:
drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
we aren't safe for that context) touched the same code.

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

RSS Atom

drivers/infiniband/core/cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/device.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/iwcm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/uverbs_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/bnxt_re/ib_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/hfi1/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mthca/mthca_main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/rdma.c	diff1 \|	diff2 \|	blob \| history
include/rdma/ib_addr.h	diff1 \|	diff2 \|	blob \| history