From patchwork Tue Apr 2 22:11:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2380891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id A1860DF2A1 for ; Tue, 2 Apr 2013 22:15:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UN9Qj-0003fu-V5; Tue, 02 Apr 2013 22:11:49 +0000 Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UN9Qg-0003fZ-GX for linux-arm-kernel@lists.infradead.org; Tue, 02 Apr 2013 22:11:47 +0000 Received: by mail-we0-f178.google.com with SMTP id z53so752855wey.9 for ; Tue, 02 Apr 2013 15:11:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:x-originating-ip:in-reply-to:references :date:message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=LAHXoPzg0cMCcrUheINe0MSR5nesT36Hh+T8gB35ciY=; b=gOY+ElAL8CqKwaCeT+Cz/0vcWHFgP43HZJz4InucLn9mropWEXGR6CYx9FlcDQHtwQ DE8O+L1/WbknHGu2T5XdRD2jbjH2ExVvvKmJ4OUcBaLJzZgL9nAmz7uAIKJH7tcTwrt2 XDpibmUHU+RGOK8mHGFlVGCPDDPTTgtW4tZRFe5VWeBVIjuh1iwo/l1Kh7o+HjII+FiL 8ER0ZKu9RBh6X6ejpCG+x0q0xv/27EhXbfJTRtZ71lw53VvyS2C6Ej6q16cBrtnz0LCi wEqABS3Jw2HcXzCg1d5RVVFBCYkgADTLVup6qR7ITK70tUIMy17sc0nmeAMILdLwTZuA nCEA== MIME-Version: 1.0 X-Received: by 10.180.73.6 with SMTP id h6mr18763164wiv.27.1364940704092; Tue, 02 Apr 2013 15:11:44 -0700 (PDT) Received: by 10.216.199.199 with HTTP; Tue, 2 Apr 2013 15:11:43 -0700 (PDT) X-Originating-IP: [2620:0:1000:1b02:6e3b:e5ff:fe16:c028] In-Reply-To: <20130402180339.GJ25867@quad.lixom.net> References: <20130328140239.GF24039@arm.com> <20130402180339.GJ25867@quad.lixom.net> Date: Tue, 2 Apr 2013 15:11:43 -0700 Message-ID: Subject: Re: [GIT PULL] Preparatory GIC patches for arm64 support From: Olof Johansson To: Catalin Marinas X-Gm-Message-State: ALoCoQmuUnlP0d7+/C5iPtIpyH75/ZISvRv/2jA6dDIM3L07VYcepvbmlUWeyIbllEt2mqmaYJbh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130402_181146_700963_34E9383E X-CRM114-Status: GOOD ( 18.38 ) 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 ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, Russell King - ARM Linux , linux-arm-kernel@lists.infradead.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tue, Apr 2, 2013 at 11:03 AM, Olof Johansson wrote: > On Thu, Mar 28, 2013 at 02:02:39PM +0000, Catalin Marinas wrote: >> Hi, >> >> As I'm about to go on holiday for two weeks and I haven't heard any >> preference for who should be merging these patches, I'm sending the pull >> request to arm-soc given that 90% of the changes target SoC code. Apart >> from the gic_secondary_init() patch, the rest is trivial header code >> moving around or removal. >> >> Russell, if you have any objections, please let arm-soc guys and me know >> and feel free to pull these patches via your tree. I don't mind either >> way. >> >> Thanks, >> >> Catalin >> >> >> The following changes since commit a937536b868b8369b98967929045f1df54234323: >> >> Linux 3.9-rc3 (2013-03-17 15:59:32 -0700) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git gic > > > Pulled as gic/cleanup into next/cleanup. > > I got a handful of context conflicts due to additions near the old > secondary_init functions, and one add/add conflict on includes. All trivial to > resolve. Tsk. When you removed from irq-vic.c, the implicit include of linux/irq.h fell out. Clearly you didn't build test this across arm defconfigs. :P I've added the following fix on top of the branch you staged: --- irqchip: vic: add include of linux/irq.h With the include of removed, the implicit include of linux/irq.h also disappeared. Add it back. Signed-off-by: Olof Johansson -Olof diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index e38cb00..884d11c 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include