From nobody Tue Mar 3 19:44:15 2026 X-Original-To: dev-commits-src-main@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 4fQR7z6HXTz6TXY0 for ; Tue, 03 Mar 2026 19:44:15 +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 4fQR7z5hdHz3cFx for ; Tue, 03 Mar 2026 19:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772567055; 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=W2JYvjus7z7bZA/gD1CECaerFQrJxDEyhsUQ8Uq6gGg=; b=wVsqtEu2qT/vGSvk8wI2JTc/dQ6JnC/67a8+9Efr+sQze+S7d0zDMmg8nruLUC7WhXLJQl X4txeeG91A3ht6Km6UhszxAXUud/NEYbSB5igY/vv1GgemOLGLpTVFzE0aAMR4nEvQtLJV Nx4EvoTXCzQCLo5W7I5slUMwpLVPRsZSelUg9vkxIijflqAHP30q6lVkeIiuU8xJwjhPaf yBph9sYSnNzTw5VokMN4YgpCHHF5UE2SFMwhQLfEsrKhfhsTfmtEE/JGN+jDTlzwRowK7X U4prp76RgLzzIQMEISQ1SSDBu+qwaWeQKPGgFbviIbTaEdj9ZC3mrNeogI5E/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772567055; a=rsa-sha256; cv=none; b=VkwTZwjJCU5SZeHHGMxtMC363zFtp+ZNlYZ1xgFdnkndHnNqNtMytKpTZik8ksc37GH2FN 5IPMHaHQNNKLrS1TZ6j2J8uET/KX7M9/lxAixWlwpLYhh4noCwI1vPl/IXFLaPd02N2L4x TAIa3kdjec6vAQJucJ7XekE9gOOOqlBkfjOgfolkXMHghIx+JohYVGgRkFrimadotLPVF6 7RmCFxBVl/uGAN+dj+s+yVL5fGx1T10GVBZ96ojVoU8HKlPKqFCLYMo8kOMJyhX5tnHmtg NR6iQqX/dev4jDXLqulhvnj6o5dAD9bWw4iqP5yh4wFW4kTw7v3TvEvjnliu/Q== 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=1772567055; 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=W2JYvjus7z7bZA/gD1CECaerFQrJxDEyhsUQ8Uq6gGg=; b=CpdQmle383BqoBPhUErsPSiAuZauVpUI6AdXYqN06SQYztOhy1N6MS0PFjK0cfpD0RGmue enGBcNRQtuyPdhmm99roj7xlO5sD9XgacKGPhU3HHFUr+mta5wD75zmVkgx6U9diATwwbP 0aG0BPEoh/w4bWFjt/oLs7VcdDq8MYrkuhu/WWKRX7PCHGtERgmyv5Vo/sFbNyxmEDy/wu R6tMzsjKVSy0EfbpVbWXOaatboItgDxCkDf4AsB+dlwfuJ72nBmBf5MhprjcjEGa38YrLW VUWwrAbhd3QCQwxCAksPuFmmtkiI8lt2LCJn5bOzlUueQ384pet9pSTo3dGcqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQR7z4lvwz3hC for ; Tue, 03 Mar 2026 19:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d37f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Mar 2026 19:44:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 5778700fb8c5 - main - diff3: Add SPDX-License-Identifier tag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9 Auto-Submitted: auto-generated Date: Tue, 03 Mar 2026 19:44:15 +0000 Message-Id: <69a73a0f.1d37f.6cae5f5b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9 commit 5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9 Author: Tuukka Pasanen AuthorDate: 2026-02-12 09:27:34 +0000 Commit: Ed Maste CommitDate: 2026-03-03 19:43:21 +0000 diff3: Add SPDX-License-Identifier tag Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55462 --- 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. *