From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Apr 2018 12:14:55 +0000 (-0700)
Subject: Merge 4.17-rc3 into tty-next
X-Git-Tag: v5.15~8711^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b6c81f46c5dd7af316bf09aa1991ceed7e53dcd;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

7b6c81f46c5dd7af316bf09aa1991ceed7e53dcd
diff --cc include/linux/serial_core.h
index d2a2e4b,b4c9fda..06ea4ee
--- a/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