Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/iser: iSER Kconfig and Makefile
  IB/iser: iSER handling of memory for RDMA
  IB/iser: iSER RDMA CM (CMA) and IB verbs interaction
  IB/iser: iSER initiator iSCSI PDU and TX/RX
  IB/iser: iSCSI iSER transport provider high level code
  IB/iser: iSCSI iSER transport provider header file
  IB/uverbs: Remove unnecessary list_del()s
  IB/uverbs: Don't free wr list when it's known to be empty

diff --combined drivers/infiniband/core/uverbs_main.c
index e57d3c50f75f9a06100da442dcc096328bc21ed8,dc1f4def3011f11ef4c9e302f898ec74e9293a82..e725cccc7cde245803a10791fec5c31c212a1b36
--- 1/drivers/infiniband/core/uverbs_main.c
--- 2/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@@ -188,7 -188,6 +188,6 @@@ static int ib_uverbs_cleanup_ucontext(s
  
                idr_remove_uobj(&ib_uverbs_ah_idr, uobj);
                ib_destroy_ah(ah);
-               list_del(&uobj->list);
                kfree(uobj);
        }
  
@@@ -200,7 -199,6 +199,6 @@@
                idr_remove_uobj(&ib_uverbs_qp_idr, uobj);
                ib_uverbs_detach_umcast(qp, uqp);
                ib_destroy_qp(qp);
-               list_del(&uobj->list);
                ib_uverbs_release_uevent(file, &uqp->uevent);
                kfree(uqp);
        }
@@@ -213,7 -211,6 +211,6 @@@
  
                idr_remove_uobj(&ib_uverbs_cq_idr, uobj);
                ib_destroy_cq(cq);
-               list_del(&uobj->list);
                ib_uverbs_release_ucq(file, ev_file, ucq);
                kfree(ucq);
        }
@@@ -225,7 -222,6 +222,6 @@@
  
                idr_remove_uobj(&ib_uverbs_srq_idr, uobj);
                ib_destroy_srq(srq);
-               list_del(&uobj->list);
                ib_uverbs_release_uevent(file, uevent);
                kfree(uevent);
        }
@@@ -243,7 -239,6 +239,6 @@@
                memobj = container_of(uobj, struct ib_umem_object, uobject);
                ib_umem_release_on_close(mrdev, &memobj->umem);
  
-               list_del(&uobj->list);
                kfree(memobj);
        }
  
@@@ -252,7 -247,6 +247,6 @@@
  
                idr_remove_uobj(&ib_uverbs_pd_idr, uobj);
                ib_dealloc_pd(pd);
-               list_del(&uobj->list);
                kfree(uobj);
        }
  
@@@ -821,12 -815,11 +815,12 @@@ static void ib_uverbs_remove_one(struc
        kref_put(&uverbs_dev->ref, ib_uverbs_release_dev);
  }
  
 -static struct super_block *uverbs_event_get_sb(struct file_system_type *fs_type, int flags,
 -                                             const char *dev_name, void *data)
 +static int uverbs_event_get_sb(struct file_system_type *fs_type, int flags,
 +                             const char *dev_name, void *data,
 +                             struct vfsmount *mnt)
  {
        return get_sb_pseudo(fs_type, "infinibandevent:", NULL,
 -                           INFINIBANDEVENTFS_MAGIC);
 +                           INFINIBANDEVENTFS_MAGIC, mnt);
  }
  
  static struct file_system_type uverbs_event_fs = {

diff --combined drivers/scsi/Makefile
index 84d546323dc792f8efbfadebe0cfe2ec004280b1,d8e2fc9d045ec13a3e68b1bd6513b09aebc589f4..ebd0cf00bf3e6a9f359f3765d0adc592a72a6ef6
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -34,6 -34,7 +34,7 @@@ obj-$(CONFIG_SCSI_ISCSI_ATTRS)        += scsi_
  obj-$(CONFIG_SCSI_SAS_ATTRS)  += scsi_transport_sas.o
  
  obj-$(CONFIG_ISCSI_TCP)       += libiscsi.o   iscsi_tcp.o
+ obj-$(CONFIG_INFINIBAND_ISER)         += libiscsi.o
  obj-$(CONFIG_SCSI_AMIGA7XX)   += amiga7xx.o   53c7xx.o
  obj-$(CONFIG_A3000_SCSI)      += a3000.o      wd33c93.o
  obj-$(CONFIG_A2091_SCSI)      += a2091.o      wd33c93.o
@@@ -165,7 -166,7 +166,7 @@@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) 
  CFLAGS_ncr53c8xx.o    := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
  zalon7xx-objs := zalon.o ncr53c8xx.o
  NCR_Q720_mod-objs     := NCR_Q720.o ncr53c8xx.o
 -libata-objs   := libata-core.o libata-scsi.o libata-bmdma.o
 +libata-objs   := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
  oktagon_esp_mod-objs  := oktagon_esp.o oktagon_io.o
  
  # Files generated that shall be removed upon make clean