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: 1002674 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ujmEOU5i"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 432CP5103mz9s1c for ; Sat, 24 Nov 2018 23:37:13 +1100 (AEDT) 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 1gQXBH-0003PU-9M; Sat, 24 Nov 2018 12:37:03 +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-Spam-Score: -5.0 (-----) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-5.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.101.70 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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(-)