Merge remote-tracking branch 'kbuild/for-next'

diff --cc Makefile
Simple merge

diff --cc arch/Kconfig
index fd6e9712af81b5bab38f871665d2a2df66d8468d,3f948c422d9d141782ad65a3440ce6ea512bf02d..84244155382273920859724fe9bca32e4ca333b7
--- 1/arch/Kconfig
--- 2/arch/Kconfig
+++ b/arch/Kconfig
@@@ -450,15 -461,25 +450,34 @@@ config CC_STACKPROTECTOR_STRON
  
  endchoice
  
 +config HAVE_ARCH_WITHIN_STACK_FRAMES
 +      bool
 +      help
 +        An architecture should select this if it can walk the kernel stack
 +        frames to determine if an object is part of either the arguments
 +        or local variables (i.e. that it excludes saved return addresses,
 +        and similar) by implementing an inline arch_within_stack_frames(),
 +        which is used by CONFIG_HARDENED_USERCOPY.
 +
+ config THIN_ARCHIVES
+       bool
+       help
+         Select this if the architecture wants to use thin archives
+         instead of ld -r to create the built-in.o files.
+ 
+ config LD_DEAD_CODE_DATA_ELIMINATION
+       bool
+       help
+         Select this if the architecture wants to do dead code and
+         data elimination with the linker by compiling with
+         -ffunction-sections -fdata-sections and linking with
+         --gc-sections.
+ 
+         This requires that the arch annotates or otherwise protects
+         its external entry points from being discarded. Linker scripts
+         must also merge .text.*, .data.*, and .bss.* correctly into
+         output sections.
+ 
  config HAVE_CONTEXT_TRACKING
        bool
        help

diff --cc arch/arm/lib/delay.c
Simple merge

diff --cc arch/arm/mach-imx/Makefile
index cab128913e72a710a0f405336b0d814e56935546,8ed8ab56bb78fa2be464677a1d8bd62da93dabdc..737450fe790c37fdb42ec122aa5147ccbadd3cc0
--- 1/arch/arm/mach-imx/Makefile
--- 2/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@@ -32,9 -32,13 +32,8 @@@ endi
  
  ifdef CONFIG_SND_IMX_SOC
  obj-y += ssi-fiq.o
- obj-y += ssi-fiq-ksym.o
  endif
  
 -# i.MX1 based machines
 -obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
 -obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
 -obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o
 -
  # i.MX21 based machines
  obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
  

diff --cc arch/m68k/kernel/Makefile
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/lib/hweight.S
Simple merge

diff --cc include/linux/compiler.h
Simple merge