Merge branch 'timers/urgent' into timers/core

Pick up urgent fixes to apply dependent cleanup patch
2018-05-02 16:11:12 +02:00
parent 1cfd904f16 7dba33c634
commit 604a98f1df
674 changed files with 8481 additions and 4801 deletions
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -188,7 +188,7 @@
 #endif

 #ifdef CONFIG_SERIAL_EARLYCON
-#define EARLYCON_TABLE() STRUCT_ALIGN();			\
+#define EARLYCON_TABLE() . = ALIGN(8);				\
 			 VMLINUX_SYMBOL(__earlycon_table) = .;	\
 			 KEEP(*(__earlycon_table))		\
 			 VMLINUX_SYMBOL(__earlycon_table_end) = .;