Merge 4.17-rc3 into tty-next

We want the tty and serial driver fixes in here as well.

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

diff --cc drivers/tty/n_gsm.c
Simple merge

diff --cc drivers/tty/serial/earlycon.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/tty/serial/mvebu-uart.c
Simple merge

diff --cc drivers/tty/serial/qcom_geni_serial.c
Simple merge

diff --cc drivers/tty/serial/xilinx_uartps.c
Simple merge

diff --cc include/linux/serial_core.h
index d2a2e4bc2435984315ea70bddad74160affe353b,b4c9fda9d8335bd3b20611d9684645dce3f8532c..06ea4eeb09abd759dec1bc9740d89220f579584f
--- 1/include/linux/serial_core.h
--- 2/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -349,14 -348,13 +349,14 @@@ struct earlycon_device 
  };
  
  struct earlycon_id {
 -      char    name[16];
 +      char    name[15];
 +      char    name_term;      /* In case compiler didn't '\0' term name */
        char    compatible[128];
        int     (*setup)(struct earlycon_device *, const char *options);
- } __aligned(32);
+ };
  
- extern const struct earlycon_id __earlycon_table[];
- extern const struct earlycon_id __earlycon_table_end[];
+ extern const struct earlycon_id *__earlycon_table[];
+ extern const struct earlycon_id *__earlycon_table_end[];
  
  #if defined(CONFIG_SERIAL_EARLYCON) && !defined(MODULE)
  #define EARLYCON_USED_OR_UNUSED       __used