From patchwork Sat Nov 24 12:36:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 10696513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9D3C15A8 for ; Sat, 24 Nov 2018 12:37:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD60A2ABF8 for ; Sat, 24 Nov 2018 12:37:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A16392AC56; Sat, 24 Nov 2018 12:37:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 35C3F2ABF8 for ; Sat, 24 Nov 2018 12:37:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=aPxZSkLW1HE0FVW0j15Lm/C8LD3CWV7oiiODG+A7BZA=; b=ujmEOU5iClSxYx tQo1Xmm/UG+VOAb3wY0SUHiBpfwg8fj3OVQEL611AGuYX0icRMR1PSmFTrKfn81q5bBg4DGQY3ryr KprkFG0azuQqVnFOPH/6Sjcsi6hUS8r3P0KmEKM8WM0cpYJTVqytWOwqaUdwdwSsgNYI0pjOr4813 76f/r81JQrTPqv4SO5ScXpJub/F3j8t5eAxTEadHKA3J+OliIpbI8LYpzl57et0RvAyQ18EyoiuPV UEiGoG8Wcc/K/EU2Mlq+CnN1jC6iPU0oavnk7THEsiI4k1h4gj/5q0c8H9RgAxsv6AVmXwue9Wpj8 7zI6i8Giam4g7KFNRuNQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gQXBG-0003PU-K1; Sat, 24 Nov 2018 12:37:02 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gQXBD-0003OX-GC for linux-arm-kernel@lists.infradead.org; Sat, 24 Nov 2018 12:37:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 444373898; Sat, 24 Nov 2018 04:36:44 -0800 (PST) Received: from mbp (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 117D23F5AF; Sat, 24 Nov 2018 04:36:42 -0800 (PST) Date: Sat, 24 Nov 2018 12:36:40 +0000 From: Catalin Marinas To: Linus Torvalds Subject: [GIT PULL] arm64 fixes for 4.20-rc4 Message-ID: <20181124123637.matxo4anfxj5q5vm@mbp> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181124_043659_552934_6B2CA779 X-CRM114-Status: GOOD ( 11.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Will Deacon , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, Please pull the arm64 fixes below. Thanks. The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6: Linux 4.20-rc3 (2018-11-18 13:33:44 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes for you to fetch changes up to 4f9f49646a5733c0c2bd49940673dde89a9c5add: arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block (2018-11-23 18:44:16 +0000) ---------------------------------------------------------------- arm64 fixes: - Fix wrong conflict resolution around CONFIG_ARM64_SSBD - Fix sparse warning on unsigned long constant ---------------------------------------------------------------- Sergey Matyukevich (1): arm64: sysreg: fix sparse warnings Will Deacon (1): arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block arch/arm64/include/asm/sysreg.h | 4 ++-- arch/arm64/kernel/cpufeature.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)