From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748AbcLMXVO (ORCPT ); Tue, 13 Dec 2016 18:21:14 -0500 Received: from ozlabs.org ([103.22.144.67]:53113 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751550AbcLMXVM (ORCPT ); Tue, 13 Dec 2016 18:21:12 -0500 Date: Wed, 14 Dec 2016 10:21:09 +1100 From: Stephen Rothwell To: Catalin Marinas Cc: Linus Torvalds , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, luto@kernel.org, Marc Zyngier Subject: Re: [GIT PULL] arm64 updates for 4.10 Message-ID: <20161214102109.41c522f1@canb.auug.org.au> In-Reply-To: <20161213192156.GA12471@e104818-lin.cambridge.arm.com> References: <20161213192156.GA12471@e104818-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, On Tue, 13 Dec 2016 19:21:59 +0000 Catalin Marinas wrote: > > Please pull the arm64 updates for 4.10 below. > > The patches touch the generic include/linux/thread_info.h to factor out > struct restart_block into a separate include/linux/restart_block.h file > (needed for arm64 moving thread_info off stack; acked by Andy > Lutomirski). > > There is also a small refactoring touching drivers/irqchip/irq-gic-v3.c > and additional watchpoint lengths added to > include/uapi/linux/hw_breakpoint.h. I have also been carrying a merge fix up patch due to a conflict in the merge of the arm64 tree with commit 272d01bd790f ("arm64: Fix circular include of asm/lse.h through linux/jump_label.h") from v4.9-rc5: From: Stephen Rothwell Date: Tue, 22 Nov 2016 10:30:40 +1100 Subject: [PATCH] arm64: merge fix for code movement to cpucaps.h Signed-off-by: Stephen Rothwell --- arch/arm64/include/asm/cpucaps.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 87b446535185..4174f09678c4 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -34,7 +34,8 @@ #define ARM64_HAS_32BIT_EL0 13 #define ARM64_HYP_OFFSET_LOW 14 #define ARM64_MISMATCHED_CACHE_LINE_SIZE 15 +#define ARM64_HAS_NO_FPSIMD 16 -#define ARM64_NCAPS 16 +#define ARM64_NCAPS 17 #endif /* __ASM_CPUCAPS_H */ -- 2.10.2 -- Cheers, Stephen Rothwell