Merge 4.13-rc5 into tty-next

We want the fixes in here, and we resolve the merge issue in the
8250_core.c file.

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

diff --cc drivers/tty/serial/8250/8250_core.c
index 3db9d6e19660da4a89042e8a26113de8d9da5bfa,1aab3010fbfae76e2c25cb60085f21051a1f24cf..d29b512a7d9fac1b182d1f63a0a34d3c181fc46d
--- 1/drivers/tty/serial/8250/8250_core.c
--- 2/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@@ -1043,14 -1043,24 +1043,25 @@@ int serial8250_register_8250_port(struc
                if (up->dl_write)
                        uart->dl_write = up->dl_write;
  
-               if (serial8250_isa_config != NULL)
-                       serial8250_isa_config(0, &uart->port,
-                                       &uart->capabilities);
+               if (uart->port.type != PORT_8250_CIR) {
+                       if (serial8250_isa_config != NULL)
+                               serial8250_isa_config(0, &uart->port,
+                                               &uart->capabilities);
+ 
++                      serial8250_apply_quirks(uart);
+                       ret = uart_add_one_port(&serial8250_reg,
+                                               &uart->port);
+                       if (ret == 0)
+                               ret = uart->port.line;
+               } else {
+                       dev_info(uart->port.dev,
+                               "skipping CIR port at 0x%lx / 0x%llx, IRQ %d\n",
+                               uart->port.iobase,
+                               (unsigned long long)uart->port.mapbase,
+                               uart->port.irq);
  
-               serial8250_apply_quirks(uart);
-               ret = uart_add_one_port(&serial8250_reg, &uart->port);
-               if (ret == 0)
-                       ret = uart->port.line;
+                       ret = 0;
+               }
        }
        mutex_unlock(&serial_mutex);
  

diff --cc drivers/tty/serial/8250/8250_exar.c
Simple merge