From nobody Tue Jul 25 20:48:46 2023 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 4R9Tdq6dwGz4nZRF; Tue, 25 Jul 2023 20:48:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R9Tdq1NK1z3l1X; Tue, 25 Jul 2023 20:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318127; 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=Z65x+vpdTcKW7JQebR2Oh8BzHhE/xtk1OWZg3i95R/Y=; b=yA1vhl6pkW43LbbJVmpeDK4BE41bgtQamRV4YqNlUp7pEMGAl6TfLeTAmeimPZkjfKLVIH cWp8zEZaKav9IpSy4F+yBnI61x9hRtAPvCjfDz2McNBfMvLIj8LrfAPbbjKva9A6GPqlO2 wE/vGX2qKLO7V5Gxou0IE0OYLBZ5xsWvJ+4Q5BR0Q/cB5WstzM6A7wOZXPE6xRyg1SV3C0 Nr3OVj6z0/EBHEBRdqDqWZe5tWZQQBX1htlD2GuiBpMYT4Y8Bx9uPJF0uk1Qwqxjqx1wW0 fOU8BnRowpozcJgt3j++uvbOYrQlac54BvEfCHO5B8QkHFvNDa963qhBhxbSWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690318127; 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=Z65x+vpdTcKW7JQebR2Oh8BzHhE/xtk1OWZg3i95R/Y=; b=IpMNUtGwj3wToor1v+opJSAOctjrnni6SNNI/pEf92MFyvFLKxdEF+vBeyVh6U8jLybH1R lY7q5n9fbZITgh4s5+D2LR/EgZn3GyTxmpF4zOSc6pRjoFxZKzYM82Z/qi2uD5W0tfQ+LT /B78+tUOrY0+7pE6pRGCWnDOeMYGNdOri/gW1ipKQXEbgRy7miSbWQxHXaRrBbX9Nbxnlb 1Su8FswiFB/Vu6V9Gkyf7lNoPPHQ29z0jQIb5tbov21xjTwMGF1V3pltZxZR0tCBVcHbiA 4jLiB+23tNEH57jTF/p4ZJzAOS+fwbN2puUikkb9ndaIZWMgTbQeNFOSBGxQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690318127; a=rsa-sha256; cv=none; b=yE/TNT35Oy1KeNIfXcxqqCmY3+5p9BJcXyABSrNIU+9X9HJYIfQlCBmE0SiV6b50g9Vw+U ahtFZprxeV0xf982NSiRDSVSky1+EX+kjwVpXRnYOqwZ5ossN8TEOrjwqT/gl5bkMQPb+F drSsvx7LXrE992aFtZvSrhS7JUMQ/VLsf0JfRpE2lmdycjZOU02pMROiM0At80KmY+zZPn FZc5mVN5jnO/6Bkbu/Zr0WQrl4YluGIlKmzt8Ibd614VhZdd7qIQzC4bj9/7NSVPkApTCa 1OWzZfJKDKWOGMlSYiZrB7ph5fwRk/BpMqwjjB3zO2vigrZNWdGyJo4LhjqneA== 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 4R9Tdp6ZNPzFk2; Tue, 25 Jul 2023 20:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36PKmkOM063698; Tue, 25 Jul 2023 20:48:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PKmk8Y063697; Tue, 25 Jul 2023 20:48:46 GMT (envelope-from git) Date: Tue, 25 Jul 2023 20:48:46 GMT Message-Id: <202307252048.36PKmk8Y063697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6d30916e9bc4 - stable/13 - spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d30916e9bc49501e1ae22575fdd0736a1191d9a Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6d30916e9bc49501e1ae22575fdd0736a1191d9a commit 6d30916e9bc49501e1ae22575fdd0736a1191d9a Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-07-25 15:18:00 +0000 spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD There never was a BSD-3-Clause-FreeBSD SPDX identifier. Replace it with BSD-3-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit eb8f887758f31f605829c995ce71a627dec0838a) --- lib/libgeom/geom_getxml.c | 2 +- lib/libgeom/geom_stats.c | 2 +- lib/libgeom/geom_xml2tree.c | 2 +- lib/libgeom/libgeom.h | 2 +- sbin/fsck_ffs/ea.c | 2 +- usr.sbin/gstat/gstat.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c index a6bb130fd5a7..a46a58328373 100644 --- a/lib/libgeom/geom_getxml.c +++ b/lib/libgeom/geom_getxml.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c index e8e2969e835f..80a29cb9148e 100644 --- a/lib/libgeom/geom_stats.c +++ b/lib/libgeom/geom_stats.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 52d21790101e..d75b8e53bcd0 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h index 339a8d34729f..86d22b125287 100644 --- a/lib/libgeom/libgeom.h +++ b/lib/libgeom/libgeom.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index f46d883e12ad..c64fb20ee9e8 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c index 65388c3002ff..cd44c740a3b4 100644 --- a/usr.sbin/gstat/gstat.c +++ b/usr.sbin/gstat/gstat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved.