Linux/linux 168bd29drivers/infiniband/hw/cxgb4 device.c, drivers/infiniband/ulp/srp ib_srp.c

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma fixes from Jason Gunthorpe:
 "Small set of three regression fixing patches, things are looking
  pretty good here.

   - Fix cxgb4 to work again with non-4k page sizes

   - NULL pointer oops in SRP during sg_reset"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  iw_cxgb4: cq/qp mask depends on bar2 pages in a host page
  cxgb4: Export sge_host_page_size to ulds
  RDMA/srp: Rework SCSI device reset handling
DeltaFile
+13-2drivers/infiniband/hw/cxgb4/device.c
+0-10drivers/infiniband/ulp/srp/ib_srp.c
+1-0drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
+1-0drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
+15-124 files

UnifiedSplitRaw