From nobody Wed Aug 5 18:50:48 2026 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 4hFfcm6xc5z6myqR for ; Wed, 05 Aug 2026 18:50:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFfcm3z4Yz3sSB for ; Wed, 05 Aug 2026 18:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785955848; 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=BiSI3iMlekxzDvTY2zXKHXQRsr70WBvQ6BuYqZE7bHY=; b=sL6V60byHv2mh16BR23/z91KtxZAPHtmN368TyKTmXcaS68jfR+sKeAiFGsxERULklGqRK XixCankxbMxPaYpP0y5LPyjr+RG0XJyIlw1b8fySutmZphL4TfUCFVBQ4meCXqTD4DoN9+ GYu6+2odEkIIiBP/fE/cMP8LF8hOHzQvzSGBeNBFy4GPiq0AcMO0RRKPkS1/77Ph0iyzWO RxVYUu/UtLJoqtDoPa1R7YHT4fd38ruYcbkbxcmhS2h9sIcAN4dUsMKAR6+4ptBWGWDlEt pIKq0FiHeRfUGrE3MmagcDck5CKLngkUdn9tzD55xszGkE7We54/s5Wm8SRInw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785955848; a=rsa-sha256; cv=none; b=VLbp5EBdMdw4Zr9YBWlBQc0LbKQAqKymvHhREr9TEbzG0cIVsxPRqdZtM07d3x6QKrNhSk HJIWI4xoKbXb8TQiKoe72nLydNT3Ke3vQ+RyM7b1+5US6Wi32M15XWpRQCKPot0DDELArI tGwQrlH3QkIPN/X7qtVRS5uV3tvecqL9pfY+k3Q3d1UZbxqBVFFc6mkMnrvze+UyvMmQaH 8B7eZCwFStcpvlXx5WmuMKgN6gtTl0mOBCIDdfhXgCwtMsaZuTKiInCtZBYE6+yIp+b2sy TkPZxemADR/3/1eKIrZBqnQmJbYNTVQQAlUL/7Y/fkjltQkXPEOhrxotb/aYSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785955848; 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=BiSI3iMlekxzDvTY2zXKHXQRsr70WBvQ6BuYqZE7bHY=; b=i3K/wMYhkTT4wgXBSS2rl4gW7w8lbXaH1ziTp7Oni+x5Kl+UT6a+fFIYxEJMarJZX+F5W3 8y/55aFJfIBz2RYCQsDnOPR0Ps+PQ26OR597CzY6pkdYys1s+P0uOLeDe1cXdA7n0Ef7/Z owLU5sm2pt+sZLS3s0QRZnKO8YGP1Si8NN2vl0e9uH/VA8qY7KrxSrEcPKggvVaCZzSHA6 Yk95EK10nVuEKNQPeqE0jmue3Ht/3+CxMFPJ0jNubyIYDgz6IRh4r9h6Mz9LH9wWx01uTP /fZqCocqKW1OZzuDwFxSgPV1lf1nMhHPCqgyu9sUIupr8QwLL7//nz3lIb7jog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFfcm2z2kzmWX for ; Wed, 05 Aug 2026 18:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 18:50:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: b60835acb984 - stable/14 - ctfmerge.1: Fix uniqlabel typos 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b60835acb9841cdc1df9921bca3f4e1f904680b5 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 18:50:48 +0000 Message-Id: <6a738608.36d91.37e22c9e@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b60835acb9841cdc1df9921bca3f4e1f904680b5 commit b60835acb9841cdc1df9921bca3f4e1f904680b5 Author: Alexander Ziaee AuthorDate: 2026-06-30 14:12:03 +0000 Commit: Alexander Ziaee CommitDate: 2026-08-05 18:50:32 +0000 ctfmerge.1: Fix uniqlabel typos The flag is -D, but it was written as a second -d. Add a period too. MFC after: 3 days (cherry picked from commit 4f293e32e4529617dd05bd64fd3c22a57a56a355) --- cddl/usr.bin/ctfmerge/ctfmerge.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1 index 1e371e62c9c5..fecbedb6e467 100644 --- a/cddl/usr.bin/ctfmerge/ctfmerge.1 +++ b/cddl/usr.bin/ctfmerge/ctfmerge.1 @@ -92,9 +92,9 @@ to store the merged CTF data. .It Fl d Ar uniqfile Uniquify against .Ar uniqfile . -.It Fl d Ar uniqlabel +.It Fl D Ar uniqlabel Uniquify against label -.Ar uniqlabel +.Ar uniqlabel . .It Fl w Ar withfile Additive merge with .Ar withfile .