From patchwork Fri Sep 2 13:26:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 113138 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 299A5B6F77 for ; Fri, 2 Sep 2011 23:27:13 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QzTly-0008Qc-Oy; Fri, 02 Sep 2011 13:27:06 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QzTly-00031k-Aa; Fri, 02 Sep 2011 13:27:06 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QzTlt-00031Q-6d for linux-arm-kernel@lists.infradead.org; Fri, 02 Sep 2011 13:27:03 +0000 Received: from e102144-lin.cambridge.arm.com (e102144-lin.cambridge.arm.com [10.1.69.60]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id p82DQj11018497; Fri, 2 Sep 2011 14:26:45 +0100 (BST) Date: Fri, 2 Sep 2011 14:26:55 +0100 From: Will Deacon To: Nicolas Pitre Subject: Re: [GIT PULL] CPU mapping platform updates for 3.2 Message-ID: <20110902132655.GA19288@e102144-lin.cambridge.arm.com> References: <20110901211107.GB5209@e102144-lin.cambridge.arm.com> <20110902083817.GA11728@e102144-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110902_092703_099934_D6F295FA X-CRM114-Status: GOOD ( 19.69 ) X-Spam-Score: -2.8 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [217.140.96.50 listed in list.dnswl.org] -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: "linux-arm-kernel@lists.infradead.org" , "arnd@arndb.de" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Fri, Sep 02, 2011 at 02:13:09PM +0100, Nicolas Pitre wrote: > On Fri, 2 Sep 2011, Will Deacon wrote: > > D'oh, I thought this might happen. The problem I have is that my core > > patches depend on one from Vincent Guittot ("ARM: 7011/1: Add ARM cpu > > topology definition"), so I ended up sending my changes via Russell's patch > > system. > > > > How about I cherry pick Vincent's patch and my core changes out of next and > > use that as a base (on top of -rc4)? > > I would instead suggest that you simply use commit c2b9ab71c6 as your > base. It is more likely to remain stable, unlike the top commit in the > for-next branch. Ok, that's easy enough, thanks for the help. > Cherry-picking needed commits would work, but they would end up being > duplicated in two different branches in the final Git history. Git can > cope with that of course, but this is usually something we try to avoid > as this could create some confusion for people. Understood. Here's the new pull request... Will The following changes since commit c2b9ab71c6e6cf8c48c5f8fda47cd10879c5c7db: Will Deacon (1): ARM: 7061/1: gic: convert logical CPU numbers into physical numbers are available in the git repository at: git://linux-arm.org/linux-2.6-wd.git for-arnd Will Deacon (5): ARM: exynos4: convert logical CPU numbers to physical numbers ARM: msm: convert logical CPU numbers to physical numbers ARM: shmobile: convert logical CPU numbers to physical numbers ARM: ux500: convert logical CPU numbers to physical numbers ARM: versatile: convert logical CPU numbers to physical numbers arch/arm/mach-exynos4/hotplug.c | 2 +- arch/arm/mach-exynos4/platsmp.c | 2 +- arch/arm/mach-msm/hotplug.c | 2 +- arch/arm/mach-msm/platsmp.c | 2 +- arch/arm/mach-realview/hotplug.c | 2 +- arch/arm/mach-shmobile/smp-sh73a0.c | 6 +++++- arch/arm/mach-ux500/hotplug.c | 2 +- arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-vexpress/hotplug.c | 2 +- arch/arm/plat-versatile/platsmp.c | 2 +- 10 files changed, 14 insertions(+), 10 deletions(-)