From nobody Sat Apr 02 13:35:32 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 70D111A51D2D; Sat, 2 Apr 2022 13:35:33 +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 4KVyj06Kr9z4gVt; Sat, 2 Apr 2022 13:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648906533; 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=Ia7XX1IQHjLSDqqfYYGuKRgJUwWyrtuE25aI21F9A5Q=; b=AfIRYo7MTfgAPgA0wOz9Nff88ncmX7rRkcjQcjv2na+CYZBx3poxZCagNxNgnNX7SvpkV3 OCPMps0bo4TixpTmQmJmBAOViPewf9zOw7bqxwmkMqMYYAPSrnQNiYxikev33pF7WCqBuv UHR7+wLRTjszL2auVu9rDZLVgSFQ9eClaK1O1ALG8rgE55yJV1O9kTz4l+f+WLE7ouUBPG mrDzioBzDv9g8kdVa8+VQ24CFPHB26MCmrHhHnxL35HP4xehg0bLg7aDmgA9NqZlMNsyll IJcW1lwA+ynE0g3TB7Q5lsbCve9/zzFAsWje+U+443uy3xY5yZCgsL4y/MbRqw== 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 7DAAF1AE3; Sat, 2 Apr 2022 13:35:32 +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 232DZWfZ002939; Sat, 2 Apr 2022 13:35:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232DZWnu002938; Sat, 2 Apr 2022 13:35:32 GMT (envelope-from git) Date: Sat, 2 Apr 2022 13:35:32 GMT Message-Id: <202204021335.232DZWnu002938@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: c6f4c1da6e69 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c6f4c1da6e69d118ee74ec7d6a5122c9050ed132 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648906533; 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=Ia7XX1IQHjLSDqqfYYGuKRgJUwWyrtuE25aI21F9A5Q=; b=VbxGDTQ+1pOI0svzWh2jutT5Fq1MPkilRcrZXeUtx7ZRccplqMAZ71Mj55IIjjarlR/1d6 mgsos3ss55ZbBJFFq4MMhk16Sk8mnQRiXcVpmaGSRjdOaCEOCJAmYxvnjSPcA69hY9zepg jTxhCMsdDA1vYFqsU5RDZ/js8Pxu4pafXsjEXGsw73x1goMNxE5qWR0yzXK5vE1+CGu5cB Yvu6FV5ttayUx95MAPaTCA629sXOzpB9rq9vXIum54eFBN4ATrB1EuW6nFw2pEuG09uQSC xSD4lrBr9aG4PGwPqVpOfISOdpr3Sq9gLjn3mZ5zI3AWuQY2Zg9JvU93PdX2Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648906533; a=rsa-sha256; cv=none; b=E7cbCUb17Zn3O2q32nRCfuZd/1M5bP1DGzk/Xk6PfKdZlQ5E0KMW2OF84QZuuM4RVDlr5I 3dt+fZQ97hitczdwUtSMjuPddNuFVB6CM3MTAHWEJY+MsUCtSPx7tKp2vSakhPLY/wsGiY lJ1gIZ8UFLg1VyZemDrB0E2dBmwCPkzk47K1NynM1Vtzf7gH1QI6Di9RmdvHdShx0aqemv SreqWhlpA/HMLg8c1M5xuFayzY+G4UjucaaPjAuRQYBo6hgSgF/aRGTwx0DV0llrpUZbAY ZElmM8DbAedxcKKvervz/DyQeMpjGBBsRN5iBQMwjzJf0Rh1Z1qFg143G5up+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=c6f4c1da6e69d118ee74ec7d6a5122c9050ed132 commit c6f4c1da6e69d118ee74ec7d6a5122c9050ed132 Author: Gordon Bergling AuthorDate: 2022-02-06 16:17:57 +0000 Commit: Gordon Bergling CommitDate: 2022-04-02 13:30:28 +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" },