From nobody Thu Jul 31 00:07:50 2025 X-Original-To: dev-commits-src-all@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 4bsqCp6zBJz63CJs; Thu, 31 Jul 2025 00:07:50 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bsqCp6DrCz3rlb; Thu, 31 Jul 2025 00:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753920470; 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=JYgs40vz4pgrbHrHJsVOt5PhoeTVbGPUtI1WSiRChvk=; b=IKBUD9NZoZOu9uZ9YocmeuAtAoj9PRgkG2NA/F6F9hWG0Ekc0Ox367eEIXkCYD7pfaW41I FjtepLrOClz9NCetMblPl6BsfELzS0Ggonqk4rT4arA/74VZDE/C6lVeZAhUWTV0cmRW/5 w2ERrKhWaY+T9y0cJLJdcTdV30nHEdt9PHOcLBkaUmOb9Rns98N0O+flRPA1t9O7my7/6l GH5zZK4TXC/J4bNre1i2bu2FRgPlxXJaAqKO4jHtI1kx3kmjYWPFFCYpr4lq3IIsp1iUDW ZdTDp27Q/9rSLFOY8QwZch12Soy0fkm8xbGy+s9UrsFDg9j4ZxgBuMY6ufDJ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753920470; 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=JYgs40vz4pgrbHrHJsVOt5PhoeTVbGPUtI1WSiRChvk=; b=PSfkP8qVEf/GZ8Scwnt8GfDaJpIyexebHHmDvsu6VHotXJrIHeOE8xe/ejjW3KzktCOnq9 WSZB8fDUe47CdKXQ8scMqb5F0UyadJoKX9DWyb4evTzZIdbVg0oeuUzXogDpczcjXdZgR9 mXzugTsK71cy/p7/WxStr9gNFSu01h1OHkwtXmIZG9bCN/Kv+Pr6RQksk3QhG8YO1W/0hJ tlfanZ2GxiH6bMdN5qF05kshK2+p5Xb7z5Lg4c8O3IuPTXA+ldKvGenHHhd3gBfVHtSn7k +eX3gAJmnWU6WZiHqIBPh0Dv7q0fYF5hJCbglRCutwN1ON7+PFsfmkw6DC1pzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753920470; a=rsa-sha256; cv=none; b=sUhk8RN4QDZXutByUN6WCyeOwAZpTK4bfkTW5l6f10xP7Cf8s1umvFCDOWsqkQlZQVP1Wb OKNKfZuaZ2nCcECpN/sx3AN6aE4zwAVVowE9Xvc/E7/VZZtOfE6MFYvMw8zDb/0z9Hg7bK rNkP6u220xt32a2X6szgir59TEd/p0r7PgTElGqQ1pHmUYrzs/5km4n+7b3Sfdp9X5MDUc vYc6zbLd8MFeb73OB2rwJlZ09E0xe1vSfqDuN3ewIKFIl4DUsy+3FUaILkobXc8Halm0NH RPTtucAgQTFbGdq3AcZsA9p6DdgkNU0Q8L2mInqEBh9reWIxSMrTMZYNp4XQ1Q== 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 4bsqCp57gwzf05; Thu, 31 Jul 2025 00:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56V07oNB026198; Thu, 31 Jul 2025 00:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56V07o5E026195; Thu, 31 Jul 2025 00:07:50 GMT (envelope-from git) Date: Thu, 31 Jul 2025 00:07:50 GMT Message-Id: <202507310007.56V07o5E026195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fd05ce71c736 - stable/13 - dtrace.1: Resolve merge conflict List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd05ce71c736143f0b3f569765f5374956ce8c10 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fd05ce71c736143f0b3f569765f5374956ce8c10 commit fd05ce71c736143f0b3f569765f5374956ce8c10 Author: Ed Maste AuthorDate: 2025-07-30 18:05:29 +0000 Commit: Ed Maste CommitDate: 2025-07-31 00:06:49 +0000 dtrace.1: Resolve merge conflict PR: 288556 Fixes: 0c91fa982437 ("dtrace_fbt.4: Document the DTrace fbt provider") (cherry picked from commit 185bd9cf219999a38093e853bfda8ed1ca21fc5b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 9b6eb03226a9..853538949a4d 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -18,13 +18,9 @@ .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. .\" -<<<<<<< HEAD -.Dd June 14, 2025 -======= .\" $FreeBSD$ .\" .Dd July 16, 2025 ->>>>>>> 9388c2887817 (dtrace_fbt.4: Document the DTrace fbt provider) .Dt DTRACE 1 .Os .Sh NAME