Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
  kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
  iscsi-target: Add iSCSI fabric support for target v4.1
  iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
  iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
  iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi

diff --cc drivers/scsi/bnx2i/bnx2i_hwi.c
Simple merge

diff --cc drivers/scsi/bnx2i/bnx2i_iscsi.c
index 5c55a75ae597a65b33e6d50b8eb6f4d81259ee4a,97ff47ce1840941c1efcb82afe13308b3ff8a4c3..cffd4d75df568a0d994e9b4e2187f4ed4ac3c30e
--- 1/drivers/scsi/bnx2i/bnx2i_iscsi.c
--- 2/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@@ -1213,10 -1212,9 +1213,10 @@@ static int bnx2i_task_xmit(struct iscsi
        struct bnx2i_conn *bnx2i_conn = conn->dd_data;
        struct scsi_cmnd *sc = task->sc;
        struct bnx2i_cmd *cmd = task->dd_data;
-       struct iscsi_cmd *hdr = (struct iscsi_cmd *) task->hdr;
+       struct iscsi_scsi_req *hdr = (struct iscsi_scsi_req *)task->hdr;
  
 -      if (bnx2i_conn->ep->num_active_cmds + 1 > hba->max_sqes)
 +      if (atomic_read(&bnx2i_conn->ep->num_active_cmds) + 1  >
 +          hba->max_sqes)
                return -ENOMEM;
  
        /*

diff --cc include/linux/kernel.h
Simple merge