From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbdAQXBd (ORCPT ); Tue, 17 Jan 2017 18:01:33 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:32931 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbdAQXBb (ORCPT ); Tue, 17 Jan 2017 18:01:31 -0500 Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree To: Stephen Rothwell , Olof Johansson , Arnd Bergmann , ARM , Russell King References: <20170118094929.7d79bb55@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Walleij From: Florian Fainelli Message-ID: Date: Tue, 17 Jan 2017 14:53:23 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170118094929.7d79bb55@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/17/2017 02:49 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/mach-ux500/platsmp.c > > between commit: > > 6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol") > > from the arm tree and commit: > > 9e634cae7256 ("ARM: ux500: simplify secondary boot") > > from the arm-soc 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. Your resolution looks correct, thanks Stephen! -- Florian