Jason Gunthorpe 89982f7cce Linux 4.18 ... -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAltwm2geHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGITkH/iSzkVhT2OxHoir0 mLVzTi7/Z17L0e/ELl7TvAC0iLFlWZKdlGR0g3b4/QpXLPmNK4HxiDRTQuWn8ke0 qDZyDq89HqLt+mpeFZ43PCd9oqV8CH2xxK3iCWReqv6bNnowGnRpSStlks4rDqWn zURC/5sUh7TzEG4s997RrrpnyPeQWUlf/Mhtzg2/WvK2btoLWgu5qzjX1uFh3s7u vaF2NXVJ3X03gPktyxZzwtO1SwLFS1jhwUXWBZ5AnoJ99ywkghQnkqS/2YpekNTm wFk80/78sU+d91aAqO8kkhHj8VRrd+9SGnZ4mB2aZHwjZjGcics4RRtxukSfOQ+6 L47IdXo= =sJkt -----END PGP SIGNATURE----- Merge tag 'v4.18' into rdma.git for-next Resolve merge conflicts from the -rc cycle against the rdma.git tree: Conflicts: drivers/infiniband/core/uverbs_cmd.c - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next - Merge removal of file->ucontext in for-next with new code in -rc drivers/infiniband/core/uverbs_main.c - for-next removed code from ib_uverbs_write() that was modified in for-rc Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>		2018-08-16 13:12:00 -06:00
..
Kconfig	Updates for 4.15 kernel merge window	2017-11-15 14:54:53 -08:00
main.c	qedr: Add user space support for SRQ	2018-08-14 16:31:54 -06:00
Makefile	RDMA/qedr: Add iWARP connection management qp related callbacks	2017-08-18 12:26:38 -04:00
qedr_hsi_rdma.h	qedr: Add support for kernel mode SRQ's	2018-08-14 16:31:54 -06:00
qedr_iw_cm.c	qedr: Add wrapping generic structure for qpidr and adjust idr routines.	2018-08-14 16:31:54 -06:00
qedr_iw_cm.h	RDMA/qedr: Add iWARP connection management functions	2017-08-18 12:27:14 -04:00
qedr_roce_cm.c	RDMA, core and ULPs: Declare ib_post_send() and ib_post_recv() arguments const	2018-07-30 20:09:34 -06:00
qedr_roce_cm.h	RDMA, core and ULPs: Declare ib_post_send() and ib_post_recv() arguments const	2018-07-30 20:09:34 -06:00
qedr.h	qedr: Add support for kernel mode SRQ's	2018-08-14 16:31:54 -06:00
verbs.c	Linux 4.18	2018-08-16 13:12:00 -06:00
verbs.h	qedr: Add support for kernel mode SRQ's	2018-08-14 16:31:54 -06:00