From nobody Sat Apr 02 13:43:53 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E1B771A589A8; Sat, 2 Apr 2022 13:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KVytg12Vbz4nwj; Sat, 2 Apr 2022 13:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648907035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arZwBwdLUFgGudWqqK+poCB8tx339hSJcnM/t4aY9Zk=; b=vI+78A4Q2zdLZ3OsTYOiaPFkit1AaIbWzcaM5/wdTmEarepKZOWvx8KrW0sRCXVDWauGUO 0TXKOE9fSd2nGQ3HuMNN0BWTA1oJRGq9eBFDTNFBV3H5frci0Ik8pBNFO0J8U77tL+mDCW b4Fq8rhq/uZzjrMk+dHei1P0Z6MuktiN670eXTmLlaCd4Rn3LujSarw0n+ptclm181zQzO PhVioxe+u91Gsl8i7gP/LWDkdVZSSJfQUzegbWfA5he7oTx93EuGEKwmuimaAU3wiulg91 AIMZB5+qjXUutwoxLoK1WPxBs8dGyNT07HfwsS0ziw7HE0QC9R4nboqW9RFG5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 634B01CD3; Sat, 2 Apr 2022 13:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 232DhrA0017724; Sat, 2 Apr 2022 13:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232Dhren017723; Sat, 2 Apr 2022 13:43:53 GMT (envelope-from git) Date: Sat, 2 Apr 2022 13:43:53 GMT Message-Id: <202204021343.232Dhren017723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e04990cf0a4f - stable/12 - pmc(3): Fix a common typo in json descriptions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e04990cf0a4f2827f884bf28df3c585b0d629eda Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648907035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arZwBwdLUFgGudWqqK+poCB8tx339hSJcnM/t4aY9Zk=; b=V1bwk/ytaJd3Vmm1+I6McGOG6WEfiwTlTFyEx/bSO/NbW+Y8h1UMRcQQk+rxNfrMtMS9yo Mu7I78TntCanUi5DRn6BDFG/IPaYiS+zRZ+eBNnpYcVVv9TaCd8UyJx1CpZXzqXGHp3Jww NoHXL8OcHudakZiNF4p5WzWZqyYVbMc3oXVZTI9vd02PZIEEcqRHb6bVXRBGOECACfPJuk SIZ85013aVVY0YTN5ai2BZO7MfBy71sWSJwqwpLdD8B1thBalZR+2OUM6039K2/Pf8Dq3Y An5vP6BacM1mEKFkTqPfX4hAFL4K/7ON9pWy8PDBWj93XJBTfUP1zfQasNFizg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648907035; a=rsa-sha256; cv=none; b=AwuqDIjWR+XBtjRMjBToolQyzOrvhiBXBGi03qu+eWz2fycXFGpJ/fmsVbe0aIBvb4c1G4 vHQ9qYrVE1jC32LYPKbc4K6r6ne/0iS/mHYPo+qxLbQIUDSZ/CpnxrDegt6iG/qZFG5+RF MNmF75wMsbxZzGFKG/q02afTmwkVXhdrTXlebreZi94K5RBQtcN/IrSTS2fNIFeHlUzpfO OKhR9AmgVeiXB7R2erDP2s7KkwXLwn9pC3gGbAhdE5FVgKlNU7e/fx++iE3N7/jFUTSDXj QerFGahdBpE3MWU3Pd9Ty4DORtZO50nSlMHthwkLtlXF11PVKoiFtXxnU/h4yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e04990cf0a4f2827f884bf28df3c585b0d629eda commit e04990cf0a4f2827f884bf28df3c585b0d629eda Author: Gordon Bergling AuthorDate: 2022-02-06 16:17:57 +0000 Commit: Gordon Bergling CommitDate: 2022-04-02 13:41:46 +0000 pmc(3): Fix a common typo in json descriptions - s/from from/from/ (cherry picked from commit 5c4aa6257210502c93ad65882a8a4842d984bae2) --- .../pmu-events/arch/x86/cascadelakex/uncore-other.json | 12 ++++++------ lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json b/lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json index 3be09986ce8b..7745a6004023 100644 --- a/lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json +++ b/lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json @@ -1499,7 +1499,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.A2I", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to I (Invalid)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from A (SnoopAll) to I (Invalid)", "UMask": "0x20", "Unit": "M2M" }, @@ -1509,7 +1509,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.A2S", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to S (Shared)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from A (SnoopAll) to S (Shared)", "UMask": "0x40", "Unit": "M2M" }, @@ -1529,7 +1529,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.I2A", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to A (SnoopAll)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from I (Invalid) to A (SnoopAll)", "UMask": "0x4", "Unit": "M2M" }, @@ -1539,7 +1539,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.I2S", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to S (Shared)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from I (Invalid) to S (Shared)", "UMask": "0x2", "Unit": "M2M" }, @@ -1549,7 +1549,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.S2A", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to A (SnoopAll)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from S (Shared) to A (SnoopAll)", "UMask": "0x10", "Unit": "M2M" }, @@ -1559,7 +1559,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.S2I", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to I (Invalid)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from S (Shared) to I (Invalid)", "UMask": "0x8", "Unit": "M2M" }, diff --git a/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json b/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json index 6ed92bc5c129..94f80fa26eab 100644 --- a/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json +++ b/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json @@ -1478,7 +1478,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.A2I", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to I (Invalid)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from A (SnoopAll) to I (Invalid)", "UMask": "0x20", "Unit": "M2M" }, @@ -1488,7 +1488,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.A2S", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to S (Shared)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from A (SnoopAll) to S (Shared)", "UMask": "0x40", "Unit": "M2M" }, @@ -1508,7 +1508,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.I2A", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to A (SnoopAll)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from I (Invalid) to A (SnoopAll)", "UMask": "0x4", "Unit": "M2M" }, @@ -1518,7 +1518,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.I2S", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to S (Shared)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from I (Invalid) to S (Shared)", "UMask": "0x2", "Unit": "M2M" }, @@ -1528,7 +1528,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.S2A", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to A (SnoopAll)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from S (Shared) to A (SnoopAll)", "UMask": "0x10", "Unit": "M2M" }, @@ -1538,7 +1538,7 @@ "EventCode": "0x2E", "EventName": "UNC_M2M_DIRECTORY_UPDATE.S2I", "PerPkg": "1", - "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to I (Invalid)", + "PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from S (Shared) to I (Invalid)", "UMask": "0x8", "Unit": "M2M" },