From nobody Sun Mar 22 08:05:59 2026 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 4fdplW5JlFz6W9cG for ; Sun, 22 Mar 2026 08:05:59 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fdplW2QMLz3ZCk for ; Sun, 22 Mar 2026 08:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePUZSCUts8z7Qju6+/BkwMbJCwEhzw+mlcxeTQuaKbY=; b=oveDW458RXddr8fQqPXsuqHL3e/quvk0qIthK1rOEnji45/fdizUQVSUZ0JtXfZT50qyUU AUiN6HWePdUf+vJUaSY+8URZlQpC1czilYWjesnjHbfTlhiB/RxjusRXleOLpsoXcZ9aKx ChpsNKhdQNqiHpmTlRjZi2DbnOUCuQaeTt+cykYxrDZJYfI9BTEYRc/f1tBMmUZi9yPtpp VLptXvVwVtv+k5P6e39h8Rdx9dD7YNJOo42t1TsQDguElritrGQhhI86yMk99SKk8uB4O9 dOfPsOfvpMOBi6CD3MCEkYzbybTqwAY/bsvB0JeDCm/sr1UACTfSUuxfAwH2BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166759; a=rsa-sha256; cv=none; b=XHvKgwIO0bwejFzPzAMv/0mKDWUWv7XBbAic0puIgq/tBv4LlFWRjeXrE/+9VxcKtudeob 3ATNzUtEJGUBC+5EatvJMdSMnzNdiz+jaqszPnfOsA7M89NIPBO8JKiKzFsHt6CKQTpL1e Eo4bokdJW3WpekIUxVHyBlIX8NSOBj/saD57SkNQczbA52KdkbxurJbaeGt6hW78Gd7Yzu QDC22SyFoPskhmmDR8GYVSDpJxPa+/ZjxFaq+eyfRQ/07vYhMjfnVAvbjyuaPpsaF62fHZ L49BzI4ic1E36QfkhKVZkvfjmiHxeZR/UB+ofLUVdys75SrvR9Gi9CU+gWhGhQ== 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=1774166759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePUZSCUts8z7Qju6+/BkwMbJCwEhzw+mlcxeTQuaKbY=; b=eyVmXlyO/2E/ahqRrmb5GmCFCuefH4Frsx9srOEydIGgQ2nmlCjXlnQXyvHKP9qo8UaNT8 jCclZqNucCpQc2QyOCOXFqMS8bt0ceTSfiW88BE+lvRK1SeC7I3Gzl5RWahZ+5H2HmDmbM G75R0kyze4sDHylR6Uooeb2lgBpUm6fYHPG2vwsDYara7EmDAFlTLkz+TCX4fYSJVb6Fr2 GPILTRLKLG6bD6ZVqNcAGpJgP9lsM/4ADCPDuAGHATMaxaBQpIKWdg65TsFFwhHwt97HTZ msPrFK8h2Ihw7r3IBEDVYWPEk1TO/Knmb5vmKMyafG5cXOgyT7l1huI7mYLz4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplW1pK2zrQh for ; Sun, 22 Mar 2026 08:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f3e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 45b0c46d1c0b - stable/15 - diff3: Add SPDX-License-Identifier tag 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:59 +0000 Message-Id: <69bfa2e7.3f3e4.5098d4c5@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 commit 45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 Author: Tuukka Pasanen AuthorDate: 2026-02-12 09:27:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:59 +0000 diff3: Add SPDX-License-Identifier tag Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55462 (cherry picked from commit 5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9) --- usr.bin/diff3/diff3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 0f114163321f..d85a5da94b10 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -1,6 +1,8 @@ /* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ /* + * SPDX-License-Identifier: Caldera-no-preamble AND BSD-3-Clause + * * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. *