Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757579AbaBUBCw (ORCPT ); Thu, 20 Feb 2014 20:02:52 -0500 Received: from mail-qc0-f170.google.com ([209.85.216.170]:59311 "EHLO mail-qc0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757564AbaBUBCs (ORCPT ); Thu, 20 Feb 2014 20:02:48 -0500 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:b490:de13:c915:10b6] In-Reply-To: <20140221115857.3ea3d7277d03c5b6b4d26488@canb.auug.org.au> References: <20140221115857.3ea3d7277d03c5b6b4d26488@canb.auug.org.au> Date: Thu, 20 Feb 2014 17:02:47 -0800 Message-ID: Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-perf tree From: Olof Johansson To: Stephen Rothwell Cc: Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , Will Deacon , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stephen Boyd , Kumar Gala Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 20, 2014 at 4:58 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/qcom-msm8960-cdp.dts between commit a1d711938959 ("ARM: > dts: msm: Add krait-pmu to platforms with Krait CPUs") from the arm-perf > tree and commit cc60a1a4d47a ("ARM: dts: msm: split out msm8660 and > msm8960 soc into dts include") from the arm-soc tree. > > I fixed it up (probably not the best way ... see below) and can carry the > fix as necessary (no action is required). Will, I think we'll be better off taking dts changes through arm-soc, unless there's a good reason to take them through other trees (such as the perf tree in this case). Is there, or should we move them over? -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/