linux-next: manual merge of the efi tree with the arm64 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the efi tree got a conflict in:

  drivers/firmware/efi/libstub/Makefile

between commit:

  68c76ad4a957 ("arm64: unwind: add asynchronous unwind tables to kernel and modules")

from the arm64 tree and commit:

  0d60ffeec53c ("efi: libstub: Deduplicate ftrace command line argument filtering")

from the efi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/firmware/efi/libstub/Makefile
index 1016f0b5311d,402dfb30ddc7..000000000000
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@@ -18,17 -22,14 +22,15 @@@ cflags-$(CONFIG_X86)		+= -m$(BITS) -D__
  
  # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly
  # disable the stackleak plugin
- cflags-$(CONFIG_ARM64)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \
- 				   -fpie $(DISABLE_STACKLEAK_PLUGIN) \
+ cflags-$(CONFIG_ARM64)		+= -fpie $(DISABLE_STACKLEAK_PLUGIN) \
 +				   -fno-unwind-tables -fno-asynchronous-unwind-tables \
  				   $(call cc-option,-mbranch-protection=none)
- cflags-$(CONFIG_ARM)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \
- 				   -fno-builtin -fpic \
+ 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)
- cflags-$(CONFIG_RISCV)		:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \
- 				   -fpic
- cflags-$(CONFIG_LOONGARCH)	:= $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \
- 				   -fpie
+ cflags-$(CONFIG_RISCV)		+= -fpic
+ cflags-$(CONFIG_LOONGARCH)	+= -fpie
  
  cflags-$(CONFIG_EFI_PARAMS_FROM_FDT)	+= -I$(srctree)/scripts/dtc/libfdt

Attachment: pgpvksv2giRw2.pgp
Description: OpenPGP digital signature