Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - avoid unnecessary rebuilds for library objects

 - fix return value of __setup handlers

 - fix invalid input check for "crashkernel=" kernel option

 - silence KASAN warnings in unwind_frame

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
  ARM: 9190/1: kdump: add invalid input check for 'crashkernel=0'
  ARM: 9187/1: JIVE: fix return value of __setup handler
  ARM: 9189/1: decompressor: fix unneeded rebuilds of library objects

diff --cc arch/arm/boot/compressed/Makefile
index 187a187706cbeb2b5d2339611b5c0a71420221ff,e65c7ad5dd4ca62519512c30952dc3deac4a32cc..41bcbb460fac459c70261a2cb384b13c56ef9058
--- 1/arch/arm/boot/compressed/Makefile
--- 2/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@@ -92,6 -92,13 +92,8 @@@ ifeq ($(CONFIG_USE_OF),y
  OBJS  += $(libfdt_objs) fdt_check_mem_start.o
  endif
  
 -# -fstack-protector-strong triggers protection checks in this code,
 -# but it is being used too early to link to meaningful stack_chk logic.
 -$(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \
 -      $(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))
 -
+ OBJS  += lib1funcs.o ashldi3.o bswapsdi2.o
+ 
  targets       := vmlinux vmlinux.lds piggy_data piggy.o \
                 head.o $(OBJS)
  

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/kernel/stacktrace.c
Simple merge