From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753309AbdDLIXR (ORCPT <rfc822;w@1wt.eu>);
        Wed, 12 Apr 2017 04:23:17 -0400
Received: from mail.free-electrons.com ([62.4.15.54]:48503 "EHLO
        mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751393AbdDLIXP (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 12 Apr 2017 04:23:15 -0400
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
        ARM <linux-arm-kernel@lists.infradead.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Gerd Hoffmann <kraxel@redhat.com>, Eric Anholt <eric@anholt.net>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree
References: <20170412083404.76cda3b3@canb.auug.org.au>
Date: Wed, 12 Apr 2017 10:23:07 +0200
In-Reply-To: <20170412083404.76cda3b3@canb.auug.org.au> (Stephen Rothwell's
        message of "Wed, 12 Apr 2017 08:34:04 +1000")
Message-ID: <87a87mhw5w.fsf@free-electrons.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Olof and Arnd,
 
 On mer., avril 12 2017, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in:
>
>   arch/arm64/configs/defconfig
>
> between commit:
>
>   3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig")
>
> from the arm-soc tree and commit:
>
>   6ff829553345 ("arm64: configs: enable SDHCI driver for Xenon")
>
> from the mvebu tree.

How do you want to proceed with this conflict?

Do you want that I merged arm-soc/next/arm64 in my mvebu/defconfig64
branch before applying my patch ?

Or do you prefer that I continue to base my branch on v4.11-rc1 and then
you will take care of the conflict when pulling the branch?

Thanks,

Gregory

>
> 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.
>
> BTW, that arm-soc commit has no Signed-off-by from its committer :-(
>
> -- 
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/configs/defconfig
> index ab4461b6b226,93b0aab959c0..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -402,7 -401,7 +402,8 @@@ CONFIG_MMC_DW_EXYNOS=
>   CONFIG_MMC_DW_K3=y
>   CONFIG_MMC_DW_ROCKCHIP=y
>   CONFIG_MMC_SUNXI=y
>  +CONFIG_MMC_BCM2835=y
> + CONFIG_MMC_SDHCI_XENON=y
>   CONFIG_NEW_LEDS=y
>   CONFIG_LEDS_CLASS=y
>   CONFIG_LEDS_GPIO=y

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com