Hi Andrew, After merging the akpm-current tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/kernel/built-in.o: In function `.apply_relocate_add': (.text+0x302e4): undefined reference to `.elf64_apply_relocate_add' I needed to add the following merge resolution patch: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Tue, 20 Sep 2016 16:50:31 +1000 Subject: [PATCH] fix another merge resolution Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 8dca64f2851f..e59ed6af0523 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -125,7 +125,7 @@ obj-y += iomap.o endif ifneq ($(CONFIG_MODULES)$(CONFIG_KEXEC_FILE),) -ifeq ($(CONFIG_WORD_SIZE),64) +ifeq ($(BITS),64) obj-y += elf_util.o elf_util_64.o endif endif -- 2.8.1 -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
