Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 debug updates from Ingo Molnar:
 "The biggest update is the addition of USB3 debug port based
  early-console.

  Greg was fine with the USB changes and with the routing of these
  patches:

    https://www.spinics.net/lists/linux-usb/msg155093.html"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  usb/doc: Add document for USB3 debug port usage
  usb/serial: Add DBC debug device support to usb_debug
  x86/earlyprintk: Add support for earlyprintk via USB3 debug port
  usb/early: Add driver for xhci debug capability
  x86/timers: Add simple udelay calibration

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/setup.c
index 62a1c74855e5a8e0eb715eb2b137774f91b6b354,2600b1d0043b22b218339c24f7779f037b13edb0..0b4d3c686b1ef94463c8caabce01e38404d1b8c1
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -1093,8 -1143,11 +1116,11 @@@ void __init setup_arch(char **cmdline_p
        cleanup_highmap();
  
        memblock_set_current_limit(ISA_END_ADDRESS);
 -      memblock_x86_fill();
 +      e820__memblock_setup();
  
+       if (!early_xdbc_setup_hardware())
+               early_xdbc_register_console();
+ 
        reserve_bios_regions();
  
        if (efi_enabled(EFI_MEMMAP)) {