From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329AbcITATn (ORCPT ); Mon, 19 Sep 2016 20:19:43 -0400 Received: from ozlabs.org ([103.22.144.67]:48827 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbcITATm (ORCPT ); Mon, 19 Sep 2016 20:19:42 -0400 Date: Tue, 20 Sep 2016 10:19:38 +1000 From: Stephen Rothwell To: Kevin Hilman , Carlo Caione , Olof Johansson , Arnd Bergmann , ARM Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet Subject: linux-next: manual merge of the amlogic tree with the arm-soc tree Message-ID: <20160920101938.5d46a0ab@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 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. I fixed it up (I used the arm-soc tree version) 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