From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 405DFC2BA19 for ; Tue, 14 Apr 2020 15:31:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 120E92075E for ; Tue, 14 Apr 2020 15:31:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ImAc/3Ix"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="j4v+Y49G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 120E92075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:In-Reply-To:MIME-Version:References: 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: List-Owner; bh=Bvyzl0Q0gMB/L/qXpJ0sEGLnRyVkASQI7QmtTtEEmMQ=; b=ImAc/3Ixl4oSMV jpEiSoOxS+0wSt7wnMFFqXqiphKEbmRG4kOKmeQrUFda7NHiwNnYb2xX9KmV+jfhNM9yt12/UYGev RWePhndkQ/YOfh3hG+xRoI9eqR4ZuTNMushUkiD3cVEqZIErNNQ2yN5PEHYYzDdgJT2LhTlmzNJNM 3Xuf5ykrJ/7AxucVbmkiRrhKRCZvsGCzxQHDgUDdpKVkD/cHRhs8cO/m1VHByXWJmWFHMI6czvXS3 IOYFVPWIMZp7YMmUxbzRx7WbPkoAm+0sMDUuCmQB4qkh/oeJvcxsURvoxmMDoPDAb1e7ec6mWrDaz TxlBTuKzQ2g+adTdwspg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jONWm-0005yh-Tm; Tue, 14 Apr 2020 15:31:08 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jONWk-0005y3-DJ for linux-arm-kernel@lists.infradead.org; Tue, 14 Apr 2020 15:31:07 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09153206D5; Tue, 14 Apr 2020 15:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586878266; bh=FDbXs02yBVwiimfHdd8tYnRnaYhvYHwOhXmf9MUIIHQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=j4v+Y49GJSWqGWT9u0+1WZaj3blXyMFsXodA8V7yrzDr/aTBtzFNmI5TyCF7zz9rn wnXcj9RFYFrMUjTVUxfS7v26Rs5n5DDTrdzFwPdtY23GzeWBud6WoUJKvA/M5jttOF isbwMKXEf4hCpKNtKB0Z9SmnrhBsF4nvY/vwqsKA= Date: Tue, 14 Apr 2020 16:31:01 +0100 From: Will Deacon To: Mark Rutland Subject: Re: [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants Message-ID: <20200414153101.GA30759@willie-the-truck> References: <20200414134706.8435-1-ardb@kernel.org> <20200414135857.GH2486@C02TD0UTHF1T.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200414135857.GH2486@C02TD0UTHF1T.local> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200414_083106_470223_5DB1A767 X-CRM114-Status: GOOD ( 10.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Apr 14, 2020 at 02:58:57PM +0100, Mark Rutland wrote: > On Tue, Apr 14, 2020 at 03:47:06PM +0200, Ard Biesheuvel wrote: > > A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice > > in arch/arm64/include/asm/sysreg.h, so drop the duplicates. > > > > Signed-off-by: Ard Biesheuvel > > Whoops. Looks like these were added in commit: > > 4bf8b96ed3f7e114 ("arm64: Check for selected granule support") > > ... and then duplicated along with all the other registers in commit: > > 3c739b5710843621 ("arm64: Keep track of CPU feature registers") Thanks for tracking that down, I was worried we might have messed up a merge conflict and potentially broken something else at the same time. Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel