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 S1754343AbcITVCe (ORCPT <rfc822;w@1wt.eu>);
        Tue, 20 Sep 2016 17:02:34 -0400
Received: from mail-pa0-f48.google.com ([209.85.220.48]:36718 "EHLO
        mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752089AbcITVCa (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 20 Sep 2016 17:02:30 -0400
From: Kevin Hilman <khilman@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Carlo Caione <carlo@caione.org>, Olof Johansson <olof@lixom.net>,
        Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Jerome Brunet <jbrunet@baylibre.com>
Subject: Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
Organization: BayLibre
References: <20160920101938.5d46a0ab@canb.auug.org.au>
Date: Tue, 20 Sep 2016 14:02:25 -0700
In-Reply-To: <20160920101938.5d46a0ab@canb.auug.org.au> (Stephen Rothwell's
        message of "Tue, 20 Sep 2016 10:19:38 +1000")
Message-ID: <7hk2e6i8ta.fsf@baylibre.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

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
>   arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>
> between commit:
>
>   8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the arm-soc tree and commit:
>
>   d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the amlogic tree.
>
> This patch was modified before being merged into the arm-soc tree.
> Please clean up the amlogic tree.

Cleaned up.

I forgot to push the updated amlogic/for-next after sending pull
requests to arm-soc.

Kevin