> +int rdma_connect_locked(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) This adds an overly long line. > +int rdma_connect_locked(struct rdma_cm_id *id, struct rdma_conn_param *conn_param); Same here. Otherwise looks good except for the nvme merge error pointed out by Chao Leng. Reviewed-by: Christoph Hellwig <hch at lst.de>