linux-next: manual merge of the scsi tree with the infiniband tree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/infiniband/ulp/iser/iser_initiator.c between commit b7f04513090c
("IB/iser: Accept session->cmds_max from user space") from the infiniband
tree and commit 6a06a4b8cff8 ("[SCSI] IB/iser: Add Discovery support")
from the scsi tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/infiniband/ulp/iser/iser_initiator.c
index bdc38f4,b31fa1d..0000000
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@@ -342,10 -249,15 +343,16 @@@ static int iser_post_rx_bufs(struct isc
  	WARN_ON(iser_conn->ib_conn->post_recv_buf_count != 1);
  	WARN_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);
  
- 	iser_dbg("Initially post: %d\n", iser_conn->ib_conn->min_posted_rx);
+ 	if (session->discovery_sess) {
+ 		iser_info("Discovery session, re-using login RX buffer\n");
+ 		return 0;
+ 	} else
+ 		iser_info("Normal session, posting batch of RX %d buffers\n",
 -			  ISER_MIN_POSTED_RX);
++			  iser_conn->ib_conn->min_posted_rx);
+ 
  	/* Initial post receive buffers */
 -	if (iser_post_recvm(iser_conn->ib_conn, ISER_MIN_POSTED_RX))
 +	if (iser_post_recvm(iser_conn->ib_conn,
 +			    iser_conn->ib_conn->min_posted_rx))
  		return -ENOMEM;
  
  	return 0;

Attachment: pgp00000.pgp
Description: PGP signature