git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Doug Ledford <dledford@redhat.com>
	Tue, 15 Dec 2015 19:10:44 +0000 (14:10 -0500)
committer	Doug Ledford <dledford@redhat.com>
	Tue, 15 Dec 2015 19:10:44 +0000 (14:10 -0500)
commit	c6333f9f9f7646e311248a09e8ed96126a97aba8
tree	1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7	tree \| snapshot
parent	9f9499ae8e6415cefc4fe0a96ad0e27864353c89	commit \| diff
parent	cfeb91b375ad5f52665e00d374a4e403d2e6063e	commit \| diff

Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq

Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/srp/ib_srp.c - Conflicts with changes in
ib_srp.c introduced during 4.4-rc updates

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/infiniband/ulp/iser/iser_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srp/ib_srp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srp/ib_srp.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/Kconfig	diff1 \|	diff2 \|	blob \| history
include/rdma/ib_verbs.h	diff1 \|	diff2 \|	blob \| history