From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Dec 2018 15:46:08 +0000 (+0100)
Subject: Merge USB 4.20-rc8 mergepoint into usb-next
X-Git-Tag: v5.0-rc1~99^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd6a22310ec2a70092e136d0cd65bb77c1502521;p=people%2Farne_f%2Fkernel.git

Merge USB 4.20-rc8 mergepoint into usb-next

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cd6a22310ec2a70092e136d0cd65bb77c1502521
diff --cc drivers/usb/host/xhci.h
index a1638f2aa3381,011dd45f87181..652dc36e30129
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1852,8 -1857,14 +1852,10 @@@ struct xhci_hcd 
  	struct xhci_port	*hw_ports;
  	struct xhci_hub		usb2_rhub;
  	struct xhci_hub		usb3_rhub;
 -	/* support xHCI 0.96 spec USB2 software LPM */
 -	unsigned		sw_lpm_support:1;
  	/* support xHCI 1.0 spec USB2 hardware LPM */
  	unsigned		hw_lpm_support:1;
+ 	/* Broken Suspend flag for SNPS Suspend resume issue */
+ 	unsigned		broken_suspend:1;
  	/* cached usb2 extened protocol capabilites */
  	u32                     *ext_caps;
  	unsigned int            num_ext_caps;