Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754194AbcKUXiV (ORCPT ); Mon, 21 Nov 2016 18:38:21 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:33791 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752774AbcKUXiT (ORCPT ); Mon, 21 Nov 2016 18:38:19 -0500 MIME-Version: 1.0 X-Originating-IP: [209.133.79.6] In-Reply-To: <20161122101908.2e967e42@canb.auug.org.au> References: <20161122101908.2e967e42@canb.auug.org.au> From: Olof Johansson Date: Mon, 21 Nov 2016 15:38:17 -0800 Message-ID: Subject: Re: linux-next: manual merge of the rockchip tree with the arm-soc tree To: Stephen Rothwell Cc: Heiko Stuebner , Arnd Bergmann , ARM , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Neil Armstrong , Kevin Hilman , Andy Yan Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 904 Lines: 31 Hi, On Mon, Nov 21, 2016 at 3:19 PM, Stephen Rothwell wrote: > Hi Heiko, > > Today's linux-next merge of the rockchip tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs") > > from the arm-soc tree and commit: > > 5295a3157348 ("arm64: defconfig: enable RK808 components") > > from the rockchip 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. This sounds fine, and it's a conflict we'll resolve when we merge this material from Heiko. -Olof