Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754537AbdHVFhF convert rfc822-to-8bit (ORCPT <rfc822;w@1wt.eu>);
        Tue, 22 Aug 2017 01:37:05 -0400
Received: from mail.free-electrons.com ([62.4.15.54]:45754 "EHLO
        mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751274AbdHVFhD (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 22 Aug 2017 01:37:03 -0400
Date: Tue, 22 Aug 2017 07:37:01 +0200
From: Boris Brezillon <boris.brezillon@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Brian Norris <computersforpeace@gmail.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nicholas Piggin <npiggin@gmail.com>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the
 kbuild-current tree
Message-ID: <20170822073701.34d77cc8@bbrezillon>
In-Reply-To: <20170822115614.1590b368@canb.auug.org.au>
References: <20170822115614.1590b368@canb.auug.org.au>
X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1204
Lines: 38

Le Tue, 22 Aug 2017 11:56:14 +1000,
Stephen Rothwell <sfr@canb.auug.org.au> a écrit :

> 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")

Masahiro, according to this message [1], you queued the above patch to
your fixes branch. Do you plan to send a fixes PR to Linus before
-rc7? If that's the case I'll merge -rc7 in l2-mtd/master, otherwise
I'll need an immutable branch.

Thanks,

Boris

[1]https://www.spinics.net/lists/arm-kernel/msg599088.html

> 
> 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.
>