From nobody Wed Jul 30 18:06:52 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 4bsgCK5yBDz62rw9; Wed, 30 Jul 2025 18:06:53 +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 4bsgCK26Tfz42pp; Wed, 30 Jul 2025 18:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753898813; 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=7anN9R+8o36+BmtUu2yBhQeUrZ6ftmGICkqw/UOWsjg=; b=Xd6WXskN5G7cNQJV8VdXHYep77YFl0UTig/fd1Qz/wbyO06sKZerOfZlZF9dC7hwSpPMZd /gddHA64qyx//l6Z5YAv5VSrJ3pTCAZTd1Z2RAJJw22jpKpT9/mhVJRlpu3Y5EstgRqqIk 7/j/EOUyVu5AHMtM1v9pxwWqfl0KB5IV2hp9W+nvZsbZqFn/PfMJ6HnULWPUF+QVM3Cyhj PGQvSRvQOE3ByM+Un4W9hPGbkKmlS6tbOL+N6JJB6MSkgesnbLdL6q37sYLuk/azDgCR3y 8VD7P7ndmW60JHdiLMzGjQcT2vYyRmE9IirFwKLUrxyasCcuAOqPKPHjRpEf+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753898813; 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=7anN9R+8o36+BmtUu2yBhQeUrZ6ftmGICkqw/UOWsjg=; b=ZcAF9aarCGFlV74MatKEZdzEZrSEIV0mBKzefUbn/a7X4iJeJneEdiyMvoCetQYaIyXWJ+ dyOOYVb1jRmRMIowXFwKF4ji9pAype8ZV7CW6m3lVaBx5u3wvGSPprspGrLRVsZjv1fDJZ kWnTWY8uNvrcwMX99kzWWWgdOtnLzs9xF6GNexPjP+kWy4Vu89yeeeg9UB7eVkG0qCt0rG rc2p10/PqfiDaFJBQT+eCEYvCeicBj3lU/i8GDt8aGGyRg3Q4/Vstyn8o7eykLemp+clWL QOQ+/7uUgZ8D4MsoG4OHy/BFBbv0biMkSI1LwYY1/vD74rqV1LMs3euJQySTJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753898813; a=rsa-sha256; cv=none; b=xc4K/olIMipA3Wm6QUVqJ2PrQzxt66ZfSE7oe57sCkSQNEREMvwg3+GD9311RG5vS5XDxx bne4ctMgLBSD1QUC1N9DQiRI91orumBb36OGhW+mqiqfblpqFLligOP5WqOyJDthiMLx+Z xx0SG/bPeiZ4eILORn7hhmj8MOSGMiP+/3Bw5OspP1/C/C/wFr4BW9EPzqZHgzYPCTXXLd w7XmxdIGBav2DDU7MgUzlQd7OsYx0a+EceTPXlrC4unL0relA/aFkVILNF40UQYQ9bdKu+ hdyBuJF6ZE3FTt1chAAexRmLYQGKtN13vQAHTjIOFadqmmCzDuTDygHKoyB6HA== 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 4bsgCJ6C3KzBRs; Wed, 30 Jul 2025 18:06:52 +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 56UI6qCH046914; Wed, 30 Jul 2025 18:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56UI6q2G046911; Wed, 30 Jul 2025 18:06:52 GMT (envelope-from git) Date: Wed, 30 Jul 2025 18:06:52 GMT Message-Id: <202507301806.56UI6q2G046911@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: 185bd9cf2199 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 185bd9cf219999a38093e853bfda8ed1ca21fc5b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=185bd9cf219999a38093e853bfda8ed1ca21fc5b commit 185bd9cf219999a38093e853bfda8ed1ca21fc5b Author: Ed Maste AuthorDate: 2025-07-30 18:05:29 +0000 Commit: Ed Maste CommitDate: 2025-07-30 18:06:38 +0000 dtrace.1: Resolve merge conflict PR: 288556 Fixes: 0c91fa982437 ("dtrace_fbt.4: Document the DTrace fbt provider") --- 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 9cb6e9dd276f..0603a32da5e2 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,11 +20,7 @@ .\" .\" $FreeBSD$ .\" -<<<<<<< HEAD -.Dd June 14, 2025 -======= .Dd July 16, 2025 ->>>>>>> 9388c2887817 (dtrace_fbt.4: Document the DTrace fbt provider) .Dt DTRACE 1 .Os .Sh NAME