From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938938AbcIFSOz (ORCPT ); Tue, 6 Sep 2016 14:14:55 -0400 Received: from foss.arm.com ([217.140.101.70]:33170 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934912AbcIFSOy (ORCPT ); Tue, 6 Sep 2016 14:14:54 -0400 Date: Tue, 6 Sep 2016 19:14:59 +0100 From: Will Deacon To: Sebastian Andrzej Siewior Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar , rt@linutronix.de, tglx@linutronix.de, Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 01/21] arm64: FP/SIMD: Convert to hotplug state machine Message-ID: <20160906181459.GE29382@arm.com> References: <20160906170457.32393-1-bigeasy@linutronix.de> <20160906170457.32393-2-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160906170457.32393-2-bigeasy@linutronix.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 06, 2016 at 07:04:37PM +0200, Sebastian Andrzej Siewior wrote: > Install the callbacks via the state machine. > > Cc: Catalin Marinas > Cc: Will Deacon > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Sebastian Andrzej Siewior > --- > arch/arm64/kernel/fpsimd.c | 22 +++++----------------- > include/linux/cpuhotplug.h | 1 + > 2 files changed, 6 insertions(+), 17 deletions(-) Looks fine to me: Acked-by: Will Deacon > diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h > index afd59e2ca4b3..0da071ff36d2 100644 > --- a/include/linux/cpuhotplug.h > +++ b/include/linux/cpuhotplug.h > @@ -20,6 +20,7 @@ enum cpuhp_state { > CPUHP_SOFTIRQ_DEAD, > CPUHP_NET_MVNETA_DEAD, > CPUHP_CPUIDLE_DEAD, > + CPUHP_ARM64_FPSIMD_DEAD, > CPUHP_WORKQUEUE_PREP, > CPUHP_POWER_NUMA_PREPARE, > CPUHP_HRTIMERS_PREPARE, Are you planning to take this via your tree? The arm64 queue already touches cpuhotplug.h for the hw-breakpoint and debugmon changes, so there's a simple conflict to address here. Will