From patchwork Tue Aug 11 23:48:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 6995171 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1629DC05AC for ; Tue, 11 Aug 2015 23:51:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2849A205E6 for ; Tue, 11 Aug 2015 23:51:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C86E203B8 for ; Tue, 11 Aug 2015 23:51:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZPJHy-0008Jy-JF; Tue, 11 Aug 2015 23:49:02 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZPJHu-0008Ik-Au for linux-arm-kernel@lists.infradead.org; Tue, 11 Aug 2015 23:48:58 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 8F1841401B5; Wed, 12 Aug 2015 09:48:34 +1000 (AEST) Date: Wed, 12 Aug 2015 09:48:34 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , , Russell King Subject: linux-next: manual merge of the arm-soc tree with the arm tree Message-ID: <20150812094834.0b0b2af1@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150811_164858_583133_4D0CC273 X-CRM114-Status: GOOD ( 12.09 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Nicolas Pitre , linux-next@vger.kernel.org, Will Deacon , linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/kernel/psci.c between commit: be120397e770 ("ARM: migrate to common PSCI client code") from the arm tree and commit: 19c233b79d1a ("ARM: appropriate __init annotation for const data") from the arm-soc tree. I fixed it up (the former removed the file, so I did that, then added the following patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Wed, 12 Aug 2015 09:39:15 +1000 Subject: [PATCH] ARM: fix for PSCI code movement Signed-off-by: Stephen Rothwell --- drivers/firmware/psci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index a6956007dd38..42700f09a8c5 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -337,7 +337,7 @@ out_put_node: return err; } -static const struct of_device_id psci_of_match[] __initconst = { +static const struct of_device_id const psci_of_match[] __initconst = { { .compatible = "arm,psci", .data = psci_0_1_init}, { .compatible = "arm,psci-0.2", .data = psci_0_2_init}, {},