--- /dev/null
+From 72a9c673636b779e370983fea08e40f97039b981 Mon Sep 17 00:00:00 2001
+From: Adam Borowski <kilobyte@angband.pl>
+Date: Tue, 9 Oct 2018 08:28:03 +0200
+Subject: x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y
+
+From: Adam Borowski <kilobyte@angband.pl>
+
+commit 72a9c673636b779e370983fea08e40f97039b981 upstream.
+
+A spanking new machine I just got has all but one USB ports wired as 3.0.
+Booting defconfig resulted in no keyboard or mouse, which was pretty
+uncool. Let's enable that -- USB3 is ubiquitous rather than an oddity.
+As 'y' not 'm' -- recovering from initrd problems needs a keyboard.
+
+Also add it to the 32-bit defconfig.
+
+Signed-off-by: Adam Borowski <kilobyte@angband.pl>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: linux-usb@vger.kernel.org
+Link: http://lkml.kernel.org/r/20181009062803.4332-1-kilobyte@angband.pl
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/configs/i386_defconfig | 1 +
+ arch/x86/configs/x86_64_defconfig | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/arch/x86/configs/i386_defconfig
++++ b/arch/x86/configs/i386_defconfig
+@@ -245,6 +245,7 @@ CONFIG_USB_HIDDEV=y
+ CONFIG_USB=y
+ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+ CONFIG_USB_MON=y
++CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_EHCI_TT_NEWSCHED=y
+ CONFIG_USB_OHCI_HCD=y
+--- a/arch/x86/configs/x86_64_defconfig
++++ b/arch/x86/configs/x86_64_defconfig
+@@ -241,6 +241,7 @@ CONFIG_USB_HIDDEV=y
+ CONFIG_USB=y
+ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+ CONFIG_USB_MON=y
++CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_EHCI_TT_NEWSCHED=y
+ CONFIG_USB_OHCI_HCD=y