From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Jul 2024 17:33:51 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
X-Git-Tag: v6.11-rc2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3894840a7a11aa06cc3b0d5a2d1b5f6878127903;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

Pull ARM updates from Russell King:

 - ftrace: don't assume stack frames are contiguous in memory

 - remove unused mod_inwind_map structure

 - spelling fixes

 - allow use of LD dead code/data elimination

 - fix callchain_trace() return value

 - add support for stackleak gcc plugin

 - correct some reset asm function prototypes for CFI

[ Missed the merge window because Russell forgot to push out ]

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9408/1: mm: CFI: Fix some erroneous reset prototypes
  ARM: 9407/1: Add support for STACKLEAK gcc plugin
  ARM: 9406/1: Fix callchain_trace() return value
  ARM: 9404/1: arm32: enable HAVE_LD_DEAD_CODE_DATA_ELIMINATION
  ARM: 9403/1: Alpine: Spelling s/initialiing/initializing/
  ARM: 9402/1: Kconfig: Spelling s/Cortex A-/Cortex-A/
  ARM: 9400/1: Remove unused struct 'mod_unwind_map'
---

3894840a7a11aa06cc3b0d5a2d1b5f6878127903
diff --cc drivers/firmware/efi/libstub/Makefile
index f23ba62ce127b,59d3dccaa8e56..ed4e8ddbe76a5
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@@ -27,9 -27,9 +27,10 @@@ cflags-$(CONFIG_ARM64)		+= -fpie $(DISA
  cflags-$(CONFIG_ARM)		+= -DEFI_HAVE_STRLEN -DEFI_HAVE_STRNLEN \
  				   -DEFI_HAVE_MEMCHR -DEFI_HAVE_STRRCHR \
  				   -DEFI_HAVE_STRCMP -fno-builtin -fpic \
- 				   $(call cc-option,-mno-single-pic-base)
+ 				   $(call cc-option,-mno-single-pic-base) \
+ 				   $(DISABLE_STACKLEAK_PLUGIN)
 -cflags-$(CONFIG_RISCV)		+= -fpic -DNO_ALTERNATIVE -mno-relax
 +cflags-$(CONFIG_RISCV)		+= -fpic -DNO_ALTERNATIVE -mno-relax \
 +				   $(DISABLE_STACKLEAK_PLUGIN)
  cflags-$(CONFIG_LOONGARCH)	+= -fpie
  
  cflags-$(CONFIG_EFI_PARAMS_FROM_FDT)	+= -I$(srctree)/scripts/dtc/libfdt