Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932148AbdHVB4S (ORCPT ); Mon, 21 Aug 2017 21:56:18 -0400 Received: from ozlabs.org ([103.22.144.67]:37115 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754388AbdHVB4Q (ORCPT ); Mon, 21 Aug 2017 21:56:16 -0400 Date: Tue, 22 Aug 2017 11:56:14 +1000 From: Stephen Rothwell To: Brian Norris , Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Nicholas Piggin , Arnd Bergmann , Boris Brezillon Subject: linux-next: manual merge of the l2-mtd tree with the kbuild-current tree Message-ID: <20170822115614.1590b368@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1763 Lines: 46 Hi Brian, Today's linux-next merge of the l2-mtd tree got a conflict in: include/asm-generic/vmlinux.lds.h between commit: cb87481ee89d ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured") from the kbuild-current tree and commit: 129f6c4820dd ("mtd: only use __xipram annotation when XIP_KERNEL is set") from the l2-mtd 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 include/asm-generic/vmlinux.lds.h index 9623d78f8494,ff507c178327..000000000000 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@@ -214,9 -198,13 +214,10 @@@ /* * .data section - * LD_DEAD_CODE_DATA_ELIMINATION option enables -fdata-sections generates - * .data.identifier which needs to be pulled in with .data, but don't want to - * pull in .data..stuff which has its own requirements. Same for bss. */ #define DATA_DATA \ + *(.xiptext) \ - *(.data .data.[0-9a-zA-Z_]*) \ + *(DATA_MAIN) \ *(.ref.data) \ *(.data..shared_aligned) /* percpu related */ \ MEM_KEEP(init.data) \