Trim various $FreeBSD$ that have snuck back in since the mass removal

Sponsored by:	Chelsio Communications

lib/libmd/tests/Makefile

@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PACKAGE=	tests
 
 ATF_TESTS_SH=	libmd_test

sbin/nvmecontrol/modules/micron/Makefile

@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 LIB=	micron
 SRCS=	micron.c
 

sbin/nvmecontrol/modules/micron/micron.c

@@ -25,9 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/ioccom.h>
 

sys/dev/aq/aq_dbg.c

@@ -37,9 +37,6 @@
  */
 
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include "aq_common.h"
 #include "aq_dbg.h"

sys/dev/aq/aq_fw.c

@@ -36,9 +36,6 @@
  * @date 2017.12.07  @author roman.agafonov@aquantia.com
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/errno.h>
 
 #include "aq_common.h"

sys/dev/aq/aq_fw1x.c

@@ -32,9 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/errno.h>
 
 #include "aq_common.h"

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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/errno.h>
 
 #include "aq_common.h"

sys/dev/aq/aq_irq.c

@@ -33,9 +33,6 @@
  */
 
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/bitstring.h>
 #include <sys/kernel.h>

sys/dev/aq/aq_main.c

@@ -32,9 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_rss.h"

sys/dev/aq/aq_media.c

@@ -32,9 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/bitstring.h>
 #include <sys/kernel.h>

sys/dev/aq/aq_ring.c

@@ -32,9 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/bitstring.h>
 #include <sys/kernel.h>

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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Copyright(c) 2001-2026, Broadcom. All rights reserved. The
  * term Broadcom refers to Broadcom Inc. and/or its subsidiaries.

sys/dev/cxgbe/crypto/t7_kern_tls.c

@@ -30,9 +30,6 @@
 #include "opt_inet6.h"
 #include "opt_kern_tls.h"
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/ktr.h>
 #include <sys/ktls.h>

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 <dev/mlx5/driver.h>

sys/dev/qcom_ess_edma/qcom_ess_edma.c

@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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__

sys/dev/qcom_ess_edma/qcom_ess_edma_desc.c

@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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__

sys/dev/qcom_ess_edma/qcom_ess_edma_gmac.c

@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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__

sys/dev/qcom_ess_edma/qcom_ess_edma_hw.c

@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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__

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$
  */
 
 /*

sys/dev/qcom_ess_edma/qcom_ess_edma_rx.c

@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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__

sys/dev/qcom_ess_edma/qcom_ess_edma_tx.c

@@ -26,9 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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__

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__

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

sys/dev/thunderbolt/nhi_reg.h

@@ -28,8 +28,6 @@
  * Thunderbolt 3 register definitions
  */
 
-/* $FreeBSD$ */
-
 #ifndef _NHI_REG_H
 #define _NHI_REG_H
 

sys/dev/thunderbolt/nhi_var.h

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  *
  * Thunderbolt 3 / Native Host Interface driver variables
- *
- * $FreeBSD$
  */
 
 #ifndef _NHI_VAR

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

sys/dev/thunderbolt/tb_debug.h

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  *
  * Thunderbolt 3 driver debug strings
- *
- * $FreeBSD$
  */
 
 #ifndef _TB_DEBUG_H

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

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 <sys/bus.h>
 #include <sys/types.h>

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

sys/dev/thunderbolt/tb_pcib.h

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  *
  * Thunderbolt PCIe bridge/switch definitions
- *
- * $FreeBSD$
  */
 
 #ifndef _TB_PCIB_H

sys/dev/thunderbolt/tb_reg.h

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  *
  * Thunderbolt Variables
- *
- * $FreeBSD$
  */
 
 #ifndef _TB_REG_H

sys/dev/thunderbolt/tb_var.h

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  *
  * Thunderbolt firmware connection manager functions.
- *
- * $FreeBSD$
  */
 
 #ifndef _TB_VAR_H

sys/dev/thunderbolt/tbcfg_reg.h

@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  *
  * Thunderbolt3/USB4 config space register definitions
- *
- * $FreeBSD$
  */
 
 #ifndef _TBCFG_REG_H

sys/dev/xen/pcifront/pcifront.c

@@ -30,9 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/systm.h>

sys/modules/armv8_rng/Makefile

@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .PATH: ${SRCTOP}/sys/dev/random
 
 KMOD=	armv8_rng

sys/modules/hwt/Makefile

@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .PATH:  ${SRCTOP}/sys/dev/hwt
 
 KMOD	= hwt

sys/modules/spe/Makefile

@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .PATH:  ${SRCTOP}/sys/arm64/spe
 
 KMOD   = spe

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