From patchwork Sun Sep 30 00:55:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 188143 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 BB0C32C00E0 for ; Sun, 30 Sep 2012 10:58:12 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TI7p7-0000Qb-3z; Sun, 30 Sep 2012 00:55:57 +0000 Received: from mho-04-ewr.mailhop.org ([204.13.248.74] helo=mho-02-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TI7p3-0000QN-Ry for linux-arm-kernel@lists.infradead.org; Sun, 30 Sep 2012 00:55:55 +0000 Received: from pool-72-84-113-162.nrflva.fios.verizon.net ([72.84.113.162] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1TI7p0-0007Rj-Uu; Sun, 30 Sep 2012 00:55:50 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 8B64D386E68; Sat, 29 Sep 2012 20:55:48 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 72.84.113.162 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+Xe1SD0hbjCosoQVAM0kg12SRsBapQTMY= Date: Sat, 29 Sep 2012 20:55:48 -0400 From: Jason Cooper To: Olof Johansson Subject: Re: [GIT PULL V2] dove late fixes for v3.7 Message-ID: <20120930005548.GN13343@titan.lakedaemon.net> References: <20120925020716.GY5469@titan.lakedaemon.net> <20120929210915.GE12999@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120929210915.GE12999@quad.lixom.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.74 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Gregory CLEMENT , Andrew Lunn , Sebastian Hesselbarth , Arnd Bergmann , Linux ARM Kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 Sat, Sep 29, 2012 at 02:09:15PM -0700, Olof Johansson wrote: > Hi, > > On Mon, Sep 24, 2012 at 10:07:16PM -0400, Jason Cooper wrote: > > Depends: > > - Based against arm-soc/for-next > > Unfortunately this won't work. The arm-soc for-next branch is not a stable > branch, it's the aggregate where we merge in the contents of different next/* > branches for staging, but the branch itself doesn't get sent upstream. > > Can you rebase this branch against something that makes more sense? Ideally the > branch that introduced the breakage, since that will minimize the upstream > exposure to the bugs. Ok, since you merged all of the kirkwood/mvebu stuff into one branch, I based against that (arm-soc/late/kirkwood). --- Depends: - Based against arm-soc/late/kirkwood - Latest changes to arch/arm/mm/cache-tauros2.c c2b7e05 ARM: cache: add dt support for tauros2 cache Misc. fixes for latest changes to mach-dove/ Fixes build breakage for mach-dove The following changes since commit 46f2007c1efadfa4071c17e75f140c47f09293de: ARM: mvebu: fix build breaks from multi-platform conversion (2012-09-28 22:27:07 +0200) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git dove/late-fixes Sebastian Hesselbarth (6): ARM: dove: Add pcie clock support ARM: dove: Fix tauros2 device tree init ARM: dove: Fix clock names of sata and gbe ARM: dove: Restructure SoC device tree descriptor ARM: dove: Remove watchdog from DT ARM: dove: Add crypto engine to DT arch/arm/boot/dts/dove.dtsi | 49 ++++++++++++++++++++++++++++--------------- arch/arm/mach-dove/common.c | 8 +++--- arch/arm/mach-dove/pcie.c | 5 ++++ 3 files changed, 41 insertions(+), 21 deletions(-)