From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966998AbdD0LMy (ORCPT ); Thu, 27 Apr 2017 07:12:54 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34577 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754157AbdD0LLz (ORCPT ); Thu, 27 Apr 2017 07:11:55 -0400 MIME-Version: 1.0 In-Reply-To: <20170427100124.GE1755@kroah.com> References: <20170421135923.2735181-1-arnd@arndb.de> <20170427100124.GE1755@kroah.com> From: Arnd Bergmann Date: Thu, 27 Apr 2017 13:11:54 +0200 X-Google-Sender-Auth: z4s2WIAfXs4KfLY3YMI25nqWIAw Message-ID: Subject: Re: [PATCH, 3.18-stable regression] ARM: psci: fix header file To: Greg KH Cc: stable@vger.kernel.org, Russell King , Linux ARM , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 27, 2017 at 12:01 PM, Greg KH wrote: > On Fri, Apr 21, 2017 at 03:59:17PM +0200, Arnd Bergmann wrote: >> Commit be95485a0b828 was incorrectly backported to 3.18 and >> now causes a different build error when CONFIG_SMP is disabled: >> >> arch/arm/kernel/psci.c:287:12: error: redefinition of 'psci_init' >> >> This version is how it should be on 3.18, with the main psci >> code built for both SMP and UP, but the psci_smp_available() >> function only being available for SMP builds. >> >> Fixes: dbcfee724255 ("ARM: 8457/1: psci-smp is built only for SMP") >> Signed-off-by: Arnd Bergmann >> --- >> arch/arm/include/asm/psci.h | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) > > This should have already been fixed in 3.18.50 as dbcfee724255 was > reverted there. Because of that, this patch does not apply to the > 3.18-stable tree. Confirmed. The report was for 3.18.49 and I already noticed the error is gone in the 3.18.50 kernelci build report. Arnd