4.4-stable patches

added patches:
	revert-xhci-plat-register-shutdown-for-xhci_plat.patch

diff --git a/queue-4.4/revert-xhci-plat-register-shutdown-for-xhci_plat.patch b/queue-4.4/revert-xhci-plat-register-shutdown-for-xhci_plat.patch
new file mode 100644 (file)
index 0000000..fd46b79
--- /dev/null
+++ b/queue-4.4/revert-xhci-plat-register-shutdown-for-xhci_plat.patch
@@ -0,0 +1,35 @@
+From ghackmann@google.com  Fri Apr 13 10:52:23 2018
+From: Greg Hackmann <ghackmann@google.com>
+Date: Thu, 12 Apr 2018 17:29:51 -0700
+Subject: Revert "xhci: plat: Register shutdown for xhci_plat"
+To: Adam Wallis <awallis@codeaurora.org>, Mathias Nyman <mathias.nyman@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Badhri Jagan Sridharan <badhri@google.com>, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Hackmann <ghackmann@google.com>, stable@vger.kernel.org
+Message-ID: <20180413002951.155762-1-ghackmann@google.com>
+
+From: Greg Hackmann <ghackmann@google.com>
+
+Pixel 2 field testers reported that when they tried to reboot their
+phones with some USB devices plugged in, the reboot would get wedged and
+eventually trigger watchdog reset.  Once the Pixel kernel team found a
+reliable repro case, they narrowed it down to this commit's 4.4.y
+backport.  Reverting the change made the issue go away.
+
+This reverts commit b07c12517f2aed0add8ce18146bb426b14099392.
+
+Signed-off-by: Greg Hackmann <ghackmann@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-plat.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -284,7 +284,6 @@ MODULE_DEVICE_TABLE(acpi, usb_xhci_acpi_
+ static struct platform_driver usb_xhci_driver = {
+       .probe  = xhci_plat_probe,
+       .remove = xhci_plat_remove,
+-      .shutdown       = usb_hcd_platform_shutdown,
+       .driver = {
+               .name = "xhci-hcd",
+               .pm = DEV_PM_OPS,

diff --git a/queue-4.4/series b/queue-4.4/series
index e4d0984fbdee024616c9c6c1f0e01d8e684e3633..c949590045f12b6acbdeb296e99579f89807173e 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -188,3 +188,4 @@ net-sched-actions-fix-dumping-which-requires-several-messages-to-user-space.patc
 net-ipv6-increment-outxxx-counters-after-netfilter-hook.patch
 ipv6-the-entire-ipv6-header-chain-must-fit-the-first-fragment.patch
 vrf-fix-use-after-free-and-double-free-in-vrf_finish_output.patch
+revert-xhci-plat-register-shutdown-for-xhci_plat.patch