From nobody Mon Sep 14 15:12:27 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 4hk7tM4vysz6shvS for ; Mon, 14 Sep 2026 15:12:27 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hk7tM4V5Lz4gys for ; Mon, 14 Sep 2026 15:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789398747; 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=DvZwmVasldDLEdLSlB89PidgPzkwQmCwDJyUWVmRh5Q=; b=oOE0o9W/FGVH8S99ypWxjlNocGVtAo8uWv/PGDS3Vb23MgzVNeDo72vRTsRQOjUfKVpzBU 5p2vPugwViK5NLuIZsFRAGPWrBi2y5FSOvqy6PaUdDXF7ex4n0fcMD+zI3QPx125yLLEWl KqAyXWDGt/M1v8Sj6Y+hjdSF+ikpqNLadqVunFhR+gZJTy54gxRIKqYNk5F+0JzU0+Qbbz DGtrY/YYSBWy2CaFjmesrXIxPVr1+ai1tSB7ZtXg+3ykDFTeJJysQLfl08EEe+qsBGbD5q AGZoskscSsSnaVPGqtT9U9GJ8y+sC1RS3MJdgLo22Nt3E9eWuk3Un8VodLBs5g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789398747; b=iEFftYEiIZYsIBxXSQaH+WNfcAUwvJntFdXzWLUxnh8Jeb8f4IHIBiXSRQryOJ24PsB0sd /7/C567XjuW2UKDM0FBkUBJRt76OYYiDeObcODWbZtglcGs7JmfjST34HahrIAkSmrLNfv lBLUjkorgMn6ksGR6nU0/Js9j91XrmqCFmZeBJw5algejp7go/n39rP/+fJvom7J+GJNcr EPrb1uN0D8wsOHFOnZED4eOM4RekidL3D6wQzc/QNpfIoDMPzg9amuQiHOdN+gHCwxdUOa L9hiH3NTKO+5KDMxlQ/nMK2o0K0XhP95xMLEeNYn+vGjqi1hN1itRxNH/B0nnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789398747; 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=DvZwmVasldDLEdLSlB89PidgPzkwQmCwDJyUWVmRh5Q=; b=Sv7ihK7sz7Jae1lOXmr+gnXCuBjSUX4YktPmR27mx4b63rrLJGxq6XTAj3bqbVpMpmV4co 31M0f6J0y2Xadncu1R0ZZ2/Ot5KVGe3fqNzFtgdQLkJzzmcDK3o/Jgsvqvx8HbtfiwSWc0 bpaMTEfDju9Wx2NTNhfzsrz8GZQimSANSWwDWIea2uOtT62tiDGIa6BVeq5iiOKCAR9S1o 9SA9PpVsi5aOLyvQGnKeAzA9L0karxtXeAR73PCuBxYKXW1VWt7ZIGdB/5D1Udb6p/Adif 638JLDpPi9hy+dGPrcdr8N9o7m3aKHm3NQD+c9kPdQUzTB7qw3oWPteGfG/y8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hk7tM3XvmzJCN for ; Mon, 14 Sep 2026 15:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 15:12:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c4f32e7a354e - main - Trim various $FreeBSD$ that have snuck back in since the mass removal 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 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4f32e7a354eeebd503714d0e2be8be87562df1c Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 15:12:27 +0000 Message-Id: <6aa80edb.379d3.71fe278b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c4f32e7a354eeebd503714d0e2be8be87562df1c commit c4f32e7a354eeebd503714d0e2be8be87562df1c Author: John Baldwin AuthorDate: 2026-09-14 15:11:34 +0000 Commit: John Baldwin CommitDate: 2026-09-14 15:11:34 +0000 Trim various $FreeBSD$ that have snuck back in since the mass removal Sponsored by: Chelsio Communications --- lib/libmd/tests/Makefile | 2 -- sbin/nvmecontrol/modules/micron/Makefile | 2 -- sbin/nvmecontrol/modules/micron/micron.c | 3 --- sys/dev/aq/aq_dbg.c | 3 --- sys/dev/aq/aq_fw.c | 3 --- sys/dev/aq/aq_fw1x.c | 3 --- sys/dev/aq/aq_fw2x.c | 3 --- sys/dev/aq/aq_irq.c | 3 --- sys/dev/aq/aq_main.c | 3 --- sys/dev/aq/aq_media.c | 3 --- sys/dev/aq/aq_ring.c | 3 --- sys/dev/bnxt/bnxt_en/hsi_struct_def.h | 3 --- sys/dev/cxgbe/crypto/t7_kern_tls.c | 3 --- sys/dev/mlx5/mlx5_core/mlx5_fs_counters.c | 2 -- sys/dev/qcom_ess_edma/qcom_ess_edma.c | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_debug.h | 2 -- sys/dev/qcom_ess_edma/qcom_ess_edma_desc.c | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_desc.h | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.c | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.h | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_hw.c | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_hw.h | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_reg.h | 2 -- sys/dev/qcom_ess_edma/qcom_ess_edma_rx.c | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_rx.h | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_tx.c | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_tx.h | 3 --- sys/dev/qcom_ess_edma/qcom_ess_edma_var.h | 3 --- sys/dev/thunderbolt/hcm_var.h | 2 -- sys/dev/thunderbolt/nhi_reg.h | 2 -- sys/dev/thunderbolt/nhi_var.h | 2 -- sys/dev/thunderbolt/router_var.h | 2 -- sys/dev/thunderbolt/tb_debug.h | 2 -- sys/dev/thunderbolt/tb_dev.h | 2 -- sys/dev/thunderbolt/tb_if.m | 2 -- sys/dev/thunderbolt/tb_ioctl.h | 2 -- sys/dev/thunderbolt/tb_pcib.h | 2 -- sys/dev/thunderbolt/tb_reg.h | 2 -- sys/dev/thunderbolt/tb_var.h | 2 -- sys/dev/thunderbolt/tbcfg_reg.h | 2 -- sys/dev/xen/pcifront/pcifront.c | 3 --- sys/modules/armv8_rng/Makefile | 2 -- sys/modules/hwt/Makefile | 2 -- sys/modules/spe/Makefile | 2 -- usr.sbin/bsdinstall/scripts/finalconfig | 2 -- 45 files changed, 114 deletions(-) diff --git a/lib/libmd/tests/Makefile b/lib/libmd/tests/Makefile index e11e8e1bf154..6021cf7313f3 100644 --- a/lib/libmd/tests/Makefile +++ b/lib/libmd/tests/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - PACKAGE= tests ATF_TESTS_SH= libmd_test diff --git a/sbin/nvmecontrol/modules/micron/Makefile b/sbin/nvmecontrol/modules/micron/Makefile index 3cefd455f711..69c68893dae1 100644 --- a/sbin/nvmecontrol/modules/micron/Makefile +++ b/sbin/nvmecontrol/modules/micron/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - LIB= micron SRCS= micron.c diff --git a/sbin/nvmecontrol/modules/micron/micron.c b/sbin/nvmecontrol/modules/micron/micron.c index 2d4731e7da47..df250ebffc7a 100644 --- a/sbin/nvmecontrol/modules/micron/micron.c +++ b/sbin/nvmecontrol/modules/micron/micron.c @@ -25,9 +25,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include diff --git a/sys/dev/aq/aq_dbg.c b/sys/dev/aq/aq_dbg.c index 078d561f5f9e..e3214917ac46 100644 --- a/sys/dev/aq/aq_dbg.c +++ b/sys/dev/aq/aq_dbg.c @@ -37,9 +37,6 @@ */ -#include -__FBSDID("$FreeBSD$"); - #include #include "aq_common.h" #include "aq_dbg.h" diff --git a/sys/dev/aq/aq_fw.c b/sys/dev/aq/aq_fw.c index 7f9714d6c7ff..a5bb86163e7c 100644 --- a/sys/dev/aq/aq_fw.c +++ b/sys/dev/aq/aq_fw.c @@ -36,9 +36,6 @@ * @date 2017.12.07 @author roman.agafonov@aquantia.com */ -#include -__FBSDID("$FreeBSD$"); - #include #include "aq_common.h" diff --git a/sys/dev/aq/aq_fw1x.c b/sys/dev/aq/aq_fw1x.c index 66a9f40f7c8a..a3cd82a1f92c 100644 --- a/sys/dev/aq/aq_fw1x.c +++ b/sys/dev/aq/aq_fw1x.c @@ -32,9 +32,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include "aq_common.h" diff --git a/sys/dev/aq/aq_fw2x.c b/sys/dev/aq/aq_fw2x.c index cfb8048ac81a..b09727ff89a6 100644 --- a/sys/dev/aq/aq_fw2x.c +++ b/sys/dev/aq/aq_fw2x.c @@ -35,9 +35,6 @@ * Firmware v2.x specific functions. * @date 2017.12.11 @author roman.agafonov@aquantia.com */ -#include -__FBSDID("$FreeBSD$"); - #include #include "aq_common.h" diff --git a/sys/dev/aq/aq_irq.c b/sys/dev/aq/aq_irq.c index 48cbb6c3f2de..374a638289a9 100644 --- a/sys/dev/aq/aq_irq.c +++ b/sys/dev/aq/aq_irq.c @@ -33,9 +33,6 @@ */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/aq/aq_main.c b/sys/dev/aq/aq_main.c index f55f958233ce..1ffa813d8b30 100644 --- a/sys/dev/aq/aq_main.c +++ b/sys/dev/aq/aq_main.c @@ -32,9 +32,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include "opt_inet.h" #include "opt_inet6.h" #include "opt_rss.h" diff --git a/sys/dev/aq/aq_media.c b/sys/dev/aq/aq_media.c index dcb59ce65b2c..2b0f7e9ca1e2 100644 --- a/sys/dev/aq/aq_media.c +++ b/sys/dev/aq/aq_media.c @@ -32,9 +32,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/aq/aq_ring.c b/sys/dev/aq/aq_ring.c index e713c5089302..13b1881d9147 100644 --- a/sys/dev/aq/aq_ring.c +++ b/sys/dev/aq/aq_ring.c @@ -32,9 +32,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/bnxt/bnxt_en/hsi_struct_def.h b/sys/dev/bnxt/bnxt_en/hsi_struct_def.h index 1bbc7b3962b9..f083c821722b 100644 --- a/sys/dev/bnxt/bnxt_en/hsi_struct_def.h +++ b/sys/dev/bnxt/bnxt_en/hsi_struct_def.h @@ -27,9 +27,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - /* * Copyright(c) 2001-2026, Broadcom. All rights reserved. The * term Broadcom refers to Broadcom Inc. and/or its subsidiaries. diff --git a/sys/dev/cxgbe/crypto/t7_kern_tls.c b/sys/dev/cxgbe/crypto/t7_kern_tls.c index 2cde8ff28794..f23e9de61c0e 100644 --- a/sys/dev/cxgbe/crypto/t7_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t7_kern_tls.c @@ -30,9 +30,6 @@ #include "opt_inet6.h" #include "opt_kern_tls.h" -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_counters.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_counters.c index f8c7b3adc2c0..b92953e9a668 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_counters.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_counters.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma.c b/sys/dev/qcom_ess_edma/qcom_ess_edma.c index 990bfe5ee074..2156d62b8ce8 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma.c +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_debug.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_debug.h index 325f03f12cb0..7263fe2c9aa2 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_debug.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_debug.h @@ -23,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef __QCOM_ESS_EDMA_DEBUG_H__ diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.c b/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.c index 11ce74137c32..00c04cb7307c 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.c +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.h index b7213d94da5d..f34820f6bde9 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_desc.h @@ -24,9 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #ifndef __QCOM_ESS_EDMA_DESC_H__ diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.c b/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.c index 6510dcc74ca2..94c837a237fc 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.c +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.h index 48862d058d99..20a90b46e3ec 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.h @@ -24,9 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #ifndef __QCOM_ESS_EDMA_GMAC_H__ diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.c b/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.c index 1ba11db248e5..7521aad17c46 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.c +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.h index 3ee3bc64b658..aca98c1d7dae 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_hw.h @@ -24,9 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #ifndef __QCOM_ESS_EDMA_HW_H__ diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_reg.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_reg.h index 0fa1e37f7e5b..fbc2c5836abc 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_reg.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_reg.h @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.c b/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.c index d39c0117133a..289abd21432e 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.c +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.h index e23d7f326b1d..22954d4b013d 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_rx.h @@ -24,9 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #ifndef __QCOM_ESS_EDMA_RX_H__ diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.c b/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.c index a86ac1dfdc31..90e6f1fdd2cc 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.c +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.h index cb1dc02e0bd1..dae89abf18b0 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_tx.h @@ -24,9 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #ifndef __QCOM_ESS_EDMA_TX_H__ diff --git a/sys/dev/qcom_ess_edma/qcom_ess_edma_var.h b/sys/dev/qcom_ess_edma/qcom_ess_edma_var.h index 0e7afcfbf1c5..20eff27e49c0 100644 --- a/sys/dev/qcom_ess_edma/qcom_ess_edma_var.h +++ b/sys/dev/qcom_ess_edma/qcom_ess_edma_var.h @@ -24,9 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * */ #ifndef __QCOM_ESS_EDMA_VAR_H__ diff --git a/sys/dev/thunderbolt/hcm_var.h b/sys/dev/thunderbolt/hcm_var.h index a11c8e9b6a92..854bbb8b9569 100644 --- a/sys/dev/thunderbolt/hcm_var.h +++ b/sys/dev/thunderbolt/hcm_var.h @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _HCM_VAR_H diff --git a/sys/dev/thunderbolt/nhi_reg.h b/sys/dev/thunderbolt/nhi_reg.h index 6db84aa4a507..a0c13c741554 100644 --- a/sys/dev/thunderbolt/nhi_reg.h +++ b/sys/dev/thunderbolt/nhi_reg.h @@ -28,8 +28,6 @@ * Thunderbolt 3 register definitions */ -/* $FreeBSD$ */ - #ifndef _NHI_REG_H #define _NHI_REG_H diff --git a/sys/dev/thunderbolt/nhi_var.h b/sys/dev/thunderbolt/nhi_var.h index d4efaa1d46ad..6acac4ed0fa6 100644 --- a/sys/dev/thunderbolt/nhi_var.h +++ b/sys/dev/thunderbolt/nhi_var.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. * * Thunderbolt 3 / Native Host Interface driver variables - * - * $FreeBSD$ */ #ifndef _NHI_VAR diff --git a/sys/dev/thunderbolt/router_var.h b/sys/dev/thunderbolt/router_var.h index 06c41e636121..a733c36d401e 100644 --- a/sys/dev/thunderbolt/router_var.h +++ b/sys/dev/thunderbolt/router_var.h @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _ROUTER_VAR_H diff --git a/sys/dev/thunderbolt/tb_debug.h b/sys/dev/thunderbolt/tb_debug.h index 6ce479a42389..2523481df76a 100644 --- a/sys/dev/thunderbolt/tb_debug.h +++ b/sys/dev/thunderbolt/tb_debug.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. * * Thunderbolt 3 driver debug strings - * - * $FreeBSD$ */ #ifndef _TB_DEBUG_H diff --git a/sys/dev/thunderbolt/tb_dev.h b/sys/dev/thunderbolt/tb_dev.h index c40a7fbc3d5a..78b950f27577 100644 --- a/sys/dev/thunderbolt/tb_dev.h +++ b/sys/dev/thunderbolt/tb_dev.h @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _TB_DEV_H diff --git a/sys/dev/thunderbolt/tb_if.m b/sys/dev/thunderbolt/tb_if.m index 8b0918811a5d..428718479a13 100644 --- a/sys/dev/thunderbolt/tb_if.m +++ b/sys/dev/thunderbolt/tb_if.m @@ -25,8 +25,6 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD$ -# #include #include diff --git a/sys/dev/thunderbolt/tb_ioctl.h b/sys/dev/thunderbolt/tb_ioctl.h index 60fafb091cef..39b81391bd11 100644 --- a/sys/dev/thunderbolt/tb_ioctl.h +++ b/sys/dev/thunderbolt/tb_ioctl.h @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _TB_IOCTL_H diff --git a/sys/dev/thunderbolt/tb_pcib.h b/sys/dev/thunderbolt/tb_pcib.h index 6928e866a083..a439ec2f87a6 100644 --- a/sys/dev/thunderbolt/tb_pcib.h +++ b/sys/dev/thunderbolt/tb_pcib.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. * * Thunderbolt PCIe bridge/switch definitions - * - * $FreeBSD$ */ #ifndef _TB_PCIB_H diff --git a/sys/dev/thunderbolt/tb_reg.h b/sys/dev/thunderbolt/tb_reg.h index b065e01e6972..aadec991ef07 100644 --- a/sys/dev/thunderbolt/tb_reg.h +++ b/sys/dev/thunderbolt/tb_reg.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. * * Thunderbolt Variables - * - * $FreeBSD$ */ #ifndef _TB_REG_H diff --git a/sys/dev/thunderbolt/tb_var.h b/sys/dev/thunderbolt/tb_var.h index 4874c420300e..695d1eee2174 100644 --- a/sys/dev/thunderbolt/tb_var.h +++ b/sys/dev/thunderbolt/tb_var.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. * * Thunderbolt firmware connection manager functions. - * - * $FreeBSD$ */ #ifndef _TB_VAR_H diff --git a/sys/dev/thunderbolt/tbcfg_reg.h b/sys/dev/thunderbolt/tbcfg_reg.h index 6ae5c6fea7fa..4057855e8b66 100644 --- a/sys/dev/thunderbolt/tbcfg_reg.h +++ b/sys/dev/thunderbolt/tbcfg_reg.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. * * Thunderbolt3/USB4 config space register definitions - * - * $FreeBSD$ */ #ifndef _TBCFG_REG_H diff --git a/sys/dev/xen/pcifront/pcifront.c b/sys/dev/xen/pcifront/pcifront.c index 76339cd3d361..b1c50a847143 100644 --- a/sys/dev/xen/pcifront/pcifront.c +++ b/sys/dev/xen/pcifront/pcifront.c @@ -30,9 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/sys/modules/armv8_rng/Makefile b/sys/modules/armv8_rng/Makefile index 29d2907aed06..169037f4be55 100644 --- a/sys/modules/armv8_rng/Makefile +++ b/sys/modules/armv8_rng/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - .PATH: ${SRCTOP}/sys/dev/random KMOD= armv8_rng diff --git a/sys/modules/hwt/Makefile b/sys/modules/hwt/Makefile index 6704e22422d1..249719453876 100644 --- a/sys/modules/hwt/Makefile +++ b/sys/modules/hwt/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - .PATH: ${SRCTOP}/sys/dev/hwt KMOD = hwt diff --git a/sys/modules/spe/Makefile b/sys/modules/spe/Makefile index da4035620bbf..c63493d2b839 100644 --- a/sys/modules/spe/Makefile +++ b/sys/modules/spe/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - .PATH: ${SRCTOP}/sys/arm64/spe KMOD = spe diff --git a/usr.sbin/bsdinstall/scripts/finalconfig b/usr.sbin/bsdinstall/scripts/finalconfig index c7814a3b6a45..aaded0fc48df 100755 --- a/usr.sbin/bsdinstall/scripts/finalconfig +++ b/usr.sbin/bsdinstall/scripts/finalconfig @@ -24,8 +24,6 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# -# $FreeBSD$ BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1