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

]> git.baikalelectronics.ru Git - kernel.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	e14aec8919dbce4e98282c7b5b229f8d20f1b500
tree	101f4c94eaa9d4c11673a41a7e5f2280fa59227d	tree \| snapshot
parent	4ec70a9759105717afcd57452ce4d0e5803f9399	commit \| diff
parent	2f483a6f739f74e69b057e7dfb6acdc570877bb6	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>

Linux Kernel Source Tree.

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