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

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

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

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