Merge tag 'usb-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB updates from Greg KH:
 "Here's the big pull request for USB and PHY drivers for 4.7-rc1

  Full details in the shortlog, but it's the normal major gadget driver
  updates, phy updates, new usbip code, as well as a bit of lots of
  other stuff.

  All have been in linux-next with no reported issues"

* tag 'usb-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (164 commits)
  USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support
  USB: serial: fix minor-number allocation
  USB: serial: quatech2: fix use-after-free in probe error path
  USB: serial: mxuport: fix use-after-free in probe error path
  USB: serial: keyspan: fix debug and error messages
  USB: serial: keyspan: fix URB unlink
  USB: serial: keyspan: fix use-after-free in probe error path
  USB: serial: io_edgeport: fix memory leaks in probe error path
  USB: serial: io_edgeport: fix memory leaks in attach error path
  usb: Remove unnecessary space before operator ','.
  usb: Remove unnecessary space before open square bracket.
  USB: FHCI: avoid redundant condition
  usb: host: xhci-rcar: Avoid long wait in xhci_reset()
  usb/host/fotg210: remove dead code in create_sysfs_files
  usb: wusbcore: Do not initialise statics to 0.
  usb: wusbcore: Remove space before ',' and '(' .
  USB: serial: cp210x: clean up CRTSCTS flag code
  USB: serial: cp210x: get rid of magic numbers in CRTSCTS flag code
  USB: serial: cp210x: fix hardware flow-control disable
  USB: serial: option: add even more ZTE device ids
  ...

diff --cc drivers/phy/Kconfig
Simple merge

diff --cc drivers/phy/Makefile
index d4f06e69fd9ab9ef657d71fce4e9125fa0cf3760,0de09e13fdbce42148f77780a3909e86f65b0331..9c3e73ccabc4193c92f02e3b077959b987d76a70
--- 1/drivers/phy/Makefile
--- 2/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -49,8 -50,6 +50,8 @@@ obj-$(CONFIG_PHY_QCOM_UFS)    += phy-qcom
  obj-$(CONFIG_PHY_QCOM_UFS)    += phy-qcom-ufs-qmp-20nm.o
  obj-$(CONFIG_PHY_QCOM_UFS)    += phy-qcom-ufs-qmp-14nm.o
  obj-$(CONFIG_PHY_TUSB1210)            += phy-tusb1210.o
- obj-$(CONFIG_PHY_BRCMSTB_SATA)                += phy-brcmstb-sata.o
+ obj-$(CONFIG_PHY_BRCM_SATA)           += phy-brcm-sata.o
  obj-$(CONFIG_PHY_PISTACHIO_USB)               += phy-pistachio-usb.o
  obj-$(CONFIG_PHY_CYGNUS_PCIE)         += phy-bcm-cygnus-pcie.o
 +
 +obj-$(CONFIG_ARCH_TEGRA) += tegra/

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/serial/mxuport.c
Simple merge

diff --cc drivers/usb/serial/usb-serial.c
Simple merge

diff --cc drivers/usb/storage/scsiglue.c
index ae85861051eb3d96afc4dba98915da1068aa4b60,7adb6c9c701838a004e90a956aa61f9a7f775a74..33eb923df8929f5500eab4d085bf61fcc5d7a6a2
--- 1/drivers/usb/storage/scsiglue.c
--- 2/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@@ -563,12 -616,30 +616,30 @@@ static const struct scsi_host_template 
        .target_alloc =                 target_alloc,
  
        /* lots of sg segments can be handled */
 -      .sg_tablesize =                 SCSI_MAX_SG_CHAIN_SEGMENTS,
 +      .sg_tablesize =                 SG_MAX_SEGMENTS,
  
-       /* limit the total size of a transfer to 120 KB */
+ 
+       /*
+        * Limit the total size of a transfer to 120 KB.
+        *
+        * Some devices are known to choke with anything larger. It seems like
+        * the problem stems from the fact that original IDE controllers had
+        * only an 8-bit register to hold the number of sectors in one transfer
+        * and even those couldn't handle a full 256 sectors.
+        *
+        * Because we want to make sure we interoperate with as many devices as
+        * possible, we will maintain a 240 sector transfer size limit for USB
+        * Mass Storage devices.
+        *
+        * Tests show that other operating have similar limits with Microsoft
+        * Windows 7 limiting transfers to 128 sectors for both USB2 and USB3
+        * and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2
+        * and 2048 for USB3 devices.
+        */
        .max_sectors =                  240,
  
-       /* merge commands... this seems to help performance, but
+       /*
+        * merge commands... this seems to help performance, but
         * periodically someone should test to see which setting is more
         * optimal.
         */