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

Pull USB updates from Greg KH:
 "Here's the big set of USB and PHY patches for 3.19-rc1.

  The normal churn in the USB gadget area is in here, as well as xhci
  and other individual USB driver updates.  The PHY tree is also in
  here, as there were dependancies on the USB tree.

  All of these have been in linux-next"

* tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (351 commits)
  arm: omap3: twl: remove usb phy init data
  usbip: fix error handling in stub_probe()
  usb: gadget: udc: missing curly braces
  USB: mos7720: delete some unneeded code
  wusb: replace memset by memzero_explicit
  usbip: remove unneeded structure
  usb: xhci: fix comment for PORT_DEV_REMOVE
  xhci: don't use the same variable for stopped and halted rings current TD
  xhci: clear extra bits from slot context when setting max exit latency
  xhci: cleanup finish_td function
  USB: adutux: NULL dereferences on disconnect
  usb: chipidea: fix platform_no_drv_owner.cocci warnings
  usb: chipidea: Fixed a few typos in comments
  Documentation: bindings: add doc for the USB2 ChipIdea USB driver
  usb: chipidea: add a usb2 driver for ci13xxx
  usb: chipidea: fix phy handling
  usb: chipidea: remove duplicate dev_set_drvdata for host_start
  usb: chipidea: parameter 'mode' isn't needed for hw_device_reset
  usb: chipidea: add controller reset API
  usb: chipidea: remove flag CI_HDRC_REQUIRE_TRANSCEIVER
  ...

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc drivers/pinctrl/pinctrl-tegra-xusb.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/gadget/function/f_hid.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/phy/phy-msm-usb.c
Simple merge

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

diff --cc drivers/usb/storage/debug.c
index 2d81e1d8ee307811f471c020c8a3f3854a3e7ebc,05bc379b9e62a229c0a73b9b9e2cf49144eed316..57bf3ad41fb63554ac4ea0bf52b87919e75e3768
--- 1/drivers/usb/storage/debug.c
--- 2/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@@ -175,23 -175,18 +175,20 @@@ void usb_stor_show_sense(const struct u
                what = "(unknown ASC/ASCQ)";
  
        usb_stor_dbg(us, "%s: ", keystr);
 -      US_DEBUGPX(what, ascq);
 -      US_DEBUGPX("\n");
 +      if (fmt)
 +              US_DEBUGPX("%s (%s%x)\n", what, fmt, ascq);
 +      else
 +              US_DEBUGPX("%s\n", what);
  }
  
- int usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
+ void usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
  {
        va_list args;
-       int r;
  
        va_start(args, fmt);
  
-       r = dev_vprintk_emit(LOGLEVEL_DEBUG, &us->pusb_dev->dev, fmt, args);
 -      dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
++      dev_vprintk_emit(LOGLEVEL_DEBUG, &us->pusb_dev->dev, fmt, args);
  
        va_end(args);
- 
-       return r;
  }
  EXPORT_SYMBOL_GPL(usb_stor_dbg);

diff --cc drivers/usb/storage/uas.c
index 4047edfb64e1d25314b2ecea18a37972d75e7874,004ebc12bc21faab4d36a0ac32feb848a65cce51..6cdabdc119a73bc172d5b2e52f024113bde09d3b
--- 1/drivers/usb/storage/uas.c
--- 2/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@@ -816,14 -806,7 +805,7 @@@ static struct scsi_host_template uas_ho
        .sg_tablesize = SG_NONE,
        .cmd_per_lun = 1,       /* until we override it */
        .skip_settle_delay = 1,
- 
-       /*
-        * The uas drivers expects tags not to be bigger than the maximum
-        * per-device queue depth, which is not true with the blk-mq tag
-        * allocator.
-        */
-       .disable_blk_mq = true,
 -      .ordered_tag = 1,
 +      .use_blk_tags = 1,
  };
  
  #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \

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

diff --cc include/linux/usb/hcd.h
Simple merge