Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Jul 2023 20:48:43 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f73b4bf27cf5 - stable/13 - spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD
Message-ID:  <202307252048.36PKmh50063638@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=f73b4bf27cf50bcd9224b6011197886f4c494f78

commit f73b4bf27cf50bcd9224b6011197886f4c494f78
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-05-10 15:40:58 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-07-25 15:15:32 +0000

    spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD
    
    The SPDX folks have obsoleted the BSD-2-Clause-NetBSD identifier. Catch
    up to that fact and revert to their recommended match of BSD-2-Clause.
    
    Discussed with:         pfg
    MFC After:              3 days
    Sponsored by:           Netflix
    
    (cherry picked from commit b61a573019428cbdc38ed03be9ecd2482011ea66)
---
 bin/pkill/pkill.c                                    | 2 +-
 include/getopt.h                                     | 2 +-
 include/hesiod.h                                     | 2 +-
 include/netconfig.h                                  | 2 +-
 include/nl_types.h                                   | 2 +-
 include/nsswitch.h                                   | 2 +-
 include/stringlist.h                                 | 2 +-
 include/wchar.h                                      | 2 +-
 lib/libc/arm/gen/arm_initfini.c                      | 2 +-
 lib/libc/arm/gen/makecontext.c                       | 2 +-
 lib/libc/gen/fmtcheck.c                              | 2 +-
 lib/libc/gen/lockf.c                                 | 2 +-
 lib/libc/mips/gen/makecontext.c                      | 2 +-
 lib/libc/net/nsdispatch.c                            | 2 +-
 lib/libc/net/nslexer.l                               | 2 +-
 lib/libc/net/nsparser.y                              | 2 +-
 lib/libc/powerpc/gen/fpgetmask.c                     | 2 +-
 lib/libc/powerpc/gen/fpgetround.c                    | 2 +-
 lib/libc/powerpc/gen/fpgetsticky.c                   | 2 +-
 lib/libc/powerpc/gen/fpsetmask.c                     | 2 +-
 lib/libc/powerpc/gen/fpsetround.c                    | 2 +-
 lib/libc/powerpc64/gen/flt_rounds.c                  | 2 +-
 lib/libc/powerpc64/gen/fpgetmask.c                   | 2 +-
 lib/libc/powerpc64/gen/fpgetround.c                  | 2 +-
 lib/libc/powerpc64/gen/fpgetsticky.c                 | 2 +-
 lib/libc/powerpc64/gen/fpsetmask.c                   | 2 +-
 lib/libc/softfloat/fpgetmask.c                       | 2 +-
 lib/libc/softfloat/fpgetround.c                      | 2 +-
 lib/libc/softfloat/fpgetsticky.c                     | 2 +-
 lib/libc/softfloat/fpsetmask.c                       | 2 +-
 lib/libc/softfloat/fpsetround.c                      | 2 +-
 lib/libc/softfloat/fpsetsticky.c                     | 2 +-
 lib/libnetbsd/stdlib.h                               | 2 +-
 lib/libnetbsd/strsuftoll.c                           | 2 +-
 lib/libusbhid/data.c                                 | 2 +-
 lib/libusbhid/descr.c                                | 2 +-
 lib/libusbhid/descr_compat.c                         | 2 +-
 lib/libusbhid/parse.c                                | 2 +-
 lib/libusbhid/usage.c                                | 2 +-
 lib/libusbhid/usbhid.h                               | 2 +-
 lib/libusbhid/usbvar.h                               | 2 +-
 libexec/rpc.sprayd/sprayd.c                          | 2 +-
 libexec/rtld-elf/powerpc/reloc.c                     | 2 +-
 libexec/rtld-elf/powerpc64/reloc.c                   | 2 +-
 sbin/camcontrol/camcontrol.h                         | 2 +-
 sbin/camcontrol/progress.c                           | 2 +-
 sbin/camcontrol/progress.h                           | 2 +-
 sbin/ccdconfig/pathnames.h                           | 2 +-
 share/examples/kld/dyn_sysctl/dyn_sysctl.c           | 2 +-
 share/examples/kld/firmware/fwconsumer/fw_consumer.c | 2 +-
 sys/arm/include/_inttypes.h                          | 2 +-
 sys/arm/include/_stdint.h                            | 2 +-
 sys/arm/include/bus_dma.h                            | 2 +-
 sys/arm/include/ucontext.h                           | 2 +-
 sys/compat/linux/linux_getcwd.c                      | 2 +-
 sys/compat/linux/linux_time.c                        | 2 +-
 sys/dev/bhnd/cores/usb/bhnd_ohci.c                   | 2 +-
 sys/dev/esp/am53c974reg.h                            | 2 +-
 sys/dev/esp/esp_pci.c                                | 2 +-
 sys/dev/esp/ncr53c9xvar.h                            | 2 +-
 sys/dev/fxp/if_fxp.c                                 | 2 +-
 sys/dev/fxp/if_fxpreg.h                              | 2 +-
 sys/dev/gem/if_gem.c                                 | 2 +-
 sys/dev/gem/if_gem_pci.c                             | 2 +-
 sys/dev/gem/if_gemreg.h                              | 2 +-
 sys/dev/gem/if_gemvar.h                              | 2 +-
 sys/dev/hid/hid.c                                    | 2 +-
 sys/dev/hid/hid.h                                    | 2 +-
 sys/dev/hid/hidquirk.c                               | 2 +-
 sys/dev/hid/hidraw.c                                 | 2 +-
 sys/dev/hid/hkbd.c                                   | 2 +-
 sys/dev/iicbus/s35390a.c                             | 2 +-
 sys/dev/le/am7990.c                                  | 2 +-
 sys/dev/le/am79900.c                                 | 2 +-
 sys/dev/le/am79900reg.h                              | 2 +-
 sys/dev/le/am79900var.h                              | 2 +-
 sys/dev/le/am7990var.h                               | 2 +-
 sys/dev/le/if_le_isa.c                               | 2 +-
 sys/dev/le/if_le_pci.c                               | 2 +-
 sys/dev/le/lance.c                                   | 2 +-
 sys/dev/le/lancereg.h                                | 2 +-
 sys/dev/le/lancevar.h                                | 2 +-
 sys/dev/mii/acphy.c                                  | 2 +-
 sys/dev/mii/bmtphy.c                                 | 2 +-
 sys/dev/mii/bmtphyreg.h                              | 2 +-
 sys/dev/mii/e1000phy.c                               | 2 +-
 sys/dev/mii/gentbi.c                                 | 2 +-
 sys/dev/mii/icsphy.c                                 | 2 +-
 sys/dev/mii/icsphyreg.h                              | 2 +-
 sys/dev/mii/lxtphy.c                                 | 2 +-
 sys/dev/mii/lxtphyreg.h                              | 2 +-
 sys/dev/mii/mii.c                                    | 2 +-
 sys/dev/mii/mii_bitbang.c                            | 2 +-
 sys/dev/mii/mii_bitbang.h                            | 2 +-
 sys/dev/mii/mii_physubr.c                            | 2 +-
 sys/dev/mii/miivar.h                                 | 2 +-
 sys/dev/mii/nsphy.c                                  | 2 +-
 sys/dev/mii/nsphyreg.h                               | 2 +-
 sys/dev/mii/nsphyter.c                               | 2 +-
 sys/dev/mii/nsphyterreg.h                            | 2 +-
 sys/dev/mii/qsphy.c                                  | 2 +-
 sys/dev/mii/qsphyreg.h                               | 2 +-
 sys/dev/mii/ukphy.c                                  | 2 +-
 sys/dev/mii/ukphy_subr.c                             | 2 +-
 sys/dev/ofw/ofw_pci.h                                | 2 +-
 sys/dev/qat/qat.c                                    | 2 +-
 sys/dev/qat/qat_ae.c                                 | 2 +-
 sys/dev/qat/qat_aevar.h                              | 2 +-
 sys/dev/qat/qat_c2xxx.c                              | 2 +-
 sys/dev/qat/qat_c2xxxreg.h                           | 2 +-
 sys/dev/qat/qat_c3xxx.c                              | 2 +-
 sys/dev/qat/qat_c3xxxreg.h                           | 2 +-
 sys/dev/qat/qat_c62x.c                               | 2 +-
 sys/dev/qat/qat_c62xreg.h                            | 2 +-
 sys/dev/qat/qat_d15xx.c                              | 2 +-
 sys/dev/qat/qat_d15xxreg.h                           | 2 +-
 sys/dev/qat/qat_dh895xccreg.h                        | 2 +-
 sys/dev/qat/qat_hw15.c                               | 2 +-
 sys/dev/qat/qat_hw15reg.h                            | 2 +-
 sys/dev/qat/qat_hw15var.h                            | 2 +-
 sys/dev/qat/qat_hw17.c                               | 2 +-
 sys/dev/qat/qat_hw17reg.h                            | 2 +-
 sys/dev/qat/qat_hw17var.h                            | 2 +-
 sys/dev/qat/qatreg.h                                 | 2 +-
 sys/dev/qat/qatvar.h                                 | 2 +-
 sys/dev/sound/midi/midi.c                            | 2 +-
 sys/dev/sound/pci/cmireg.h                           | 2 +-
 sys/dev/sound/pci/via82c686.h                        | 2 +-
 sys/dev/sound/usb/uaudio.c                           | 2 +-
 sys/dev/sound/usb/uaudioreg.h                        | 2 +-
 sys/dev/stge/if_stge.c                               | 2 +-
 sys/dev/stge/if_stgereg.h                            | 2 +-
 sys/dev/usb/controller/ehci.h                        | 2 +-
 sys/dev/usb/controller/ehci_pci.c                    | 2 +-
 sys/dev/usb/controller/ehcireg.h                     | 2 +-
 sys/dev/usb/controller/ohci.h                        | 2 +-
 sys/dev/usb/controller/ohci_pci.c                    | 2 +-
 sys/dev/usb/input/uhid.c                             | 2 +-
 sys/dev/usb/input/ukbd.c                             | 2 +-
 sys/dev/usb/input/usbhid.c                           | 2 +-
 sys/dev/usb/quirk/usb_quirk.c                        | 2 +-
 sys/dev/usb/serial/ubsa.c                            | 2 +-
 sys/dev/usb/serial/ubser.c                           | 2 +-
 sys/dev/usb/serial/uchcom.c                          | 2 +-
 sys/dev/usb/serial/ufoma.c                           | 2 +-
 sys/dev/usb/serial/uftdi.c                           | 2 +-
 sys/dev/usb/serial/ugensa.c                          | 2 +-
 sys/dev/usb/serial/uipaq.c                           | 2 +-
 sys/dev/usb/serial/ulpt.c                            | 2 +-
 sys/dev/usb/serial/umodem.c                          | 2 +-
 sys/dev/usb/serial/uplcom.c                          | 2 +-
 sys/dev/usb/serial/usb_serial.c                      | 2 +-
 sys/dev/usb/serial/usb_serial.h                      | 2 +-
 sys/dev/usb/serial/uvisor.c                          | 2 +-
 sys/dev/usb/usb.h                                    | 2 +-
 sys/dev/usb/usb_cdc.h                                | 2 +-
 sys/dev/usb/usb_hid.c                                | 2 +-
 sys/dev/usb/usb_hub.c                                | 2 +-
 sys/dev/usb/usb_hub_acpi.c                           | 2 +-
 sys/dev/usb/usb_hub_private.h                        | 2 +-
 sys/dev/usb/usbhid.h                                 | 2 +-
 sys/dev/xl/xlphy.c                                   | 2 +-
 sys/fs/tmpfs/tmpfs.h                                 | 2 +-
 sys/fs/tmpfs/tmpfs_fifoops.c                         | 2 +-
 sys/fs/tmpfs/tmpfs_fifoops.h                         | 2 +-
 sys/fs/tmpfs/tmpfs_subr.c                            | 2 +-
 sys/fs/tmpfs/tmpfs_vfsops.c                          | 2 +-
 sys/fs/tmpfs/tmpfs_vnops.c                           | 2 +-
 sys/fs/tmpfs/tmpfs_vnops.h                           | 2 +-
 sys/geom/geom_ccd.c                                  | 2 +-
 sys/mips/cavium/octopci_bus_space.c                  | 2 +-
 sys/mips/include/_inttypes.h                         | 2 +-
 sys/mips/include/bus.h                               | 2 +-
 sys/mips/include/elf.h                               | 2 +-
 sys/mips/malta/gt_pci_bus_space.h                    | 2 +-
 sys/mips/malta/gtreg.h                               | 2 +-
 sys/mips/mips/bus_space_generic.c                    | 2 +-
 sys/mips/mips/gdb_machdep.c                          | 2 +-
 sys/net/bridgestp.c                                  | 2 +-
 sys/net/ieee8023ad_lacp.c                            | 2 +-
 sys/net/ieee8023ad_lacp.h                            | 2 +-
 sys/netinet/ip_gre.c                                 | 2 +-
 sys/powerpc/fpu/fpu_extern.h                         | 2 +-
 sys/powerpc/include/bat.h                            | 2 +-
 sys/powerpc/include/bus.h                            | 2 +-
 sys/sys/bus_dma.h                                    | 2 +-
 sys/tools/miidevs2h.awk                              | 2 +-
 sys/tools/pccarddevs2h.awk                           | 2 +-
 sys/x86/include/_inttypes.h                          | 2 +-
 sys/x86/include/bus.h                                | 2 +-
 sys/x86/xen/pv.c                                     | 2 +-
 usr.bin/gencat/gencat.c                              | 2 +-
 usr.bin/gzip/gzip.c                                  | 2 +-
 usr.bin/gzip/unbzip2.c                               | 2 +-
 usr.bin/gzip/unxz.c                                  | 2 +-
 usr.bin/nl/nl.c                                      | 2 +-
 usr.bin/seq/seq.c                                    | 2 +-
 usr.bin/stat/stat.c                                  | 2 +-
 usr.bin/usbhidaction/usbhidaction.c                  | 2 +-
 usr.bin/usbhidctl/usbhid.c                           | 2 +-
 usr.bin/ypcat/ypcat.c                                | 2 +-
 usr.bin/ypmatch/ypmatch.c                            | 2 +-
 usr.bin/ypwhich/ypwhich.c                            | 2 +-
 usr.sbin/bluetooth/btpand/bnep.c                     | 2 +-
 usr.sbin/bluetooth/btpand/bnep.h                     | 2 +-
 usr.sbin/bluetooth/btpand/btpand.c                   | 2 +-
 usr.sbin/bluetooth/btpand/btpand.h                   | 2 +-
 usr.sbin/bluetooth/btpand/channel.c                  | 2 +-
 usr.sbin/bluetooth/btpand/packet.c                   | 2 +-
 usr.sbin/bluetooth/btpand/sdp.c                      | 2 +-
 usr.sbin/bluetooth/btpand/sdp.h                      | 2 +-
 usr.sbin/bluetooth/btpand/server.c                   | 2 +-
 usr.sbin/bluetooth/btpand/tap.c                      | 2 +-
 usr.sbin/makefs/cd9660.c                             | 2 +-
 usr.sbin/makefs/cd9660.h                             | 2 +-
 usr.sbin/makefs/cd9660/cd9660_conversion.c           | 2 +-
 usr.sbin/makefs/cd9660/cd9660_debug.c                | 2 +-
 usr.sbin/makefs/cd9660/cd9660_eltorito.c             | 2 +-
 usr.sbin/makefs/cd9660/cd9660_eltorito.h             | 2 +-
 usr.sbin/makefs/cd9660/cd9660_strings.c              | 2 +-
 usr.sbin/makefs/cd9660/cd9660_write.c                | 2 +-
 usr.sbin/makefs/cd9660/iso9660_rrip.c                | 2 +-
 usr.sbin/makefs/cd9660/iso9660_rrip.h                | 2 +-
 usr.sbin/makefs/ffs/ffs_bswap.c                      | 2 +-
 usr.sbin/makefs/ffs/newfs_extern.h                   | 2 +-
 usr.sbin/makefs/ffs/ufs_bswap.h                      | 2 +-
 usr.sbin/rpcbind/util.c                              | 2 +-
 usr.sbin/services_mkdb/extern.h                      | 2 +-
 usr.sbin/services_mkdb/services_mkdb.c               | 2 +-
 usr.sbin/services_mkdb/uniq.c                        | 2 +-
 usr.sbin/ypset/ypset.c                               | 2 +-
 231 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index 6d8f29147a04..93349ecdafee 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: pkill.c,v 1.16 2005/10/10 22:13:20 kleink Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/include/getopt.h b/include/getopt.h
index 789b4d1d434c..4c0399db8545 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -2,7 +2,7 @@
 /*	$FreeBSD$ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/include/hesiod.h b/include/hesiod.h
index e8c38d84dccb..a06b69d32413 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -3,7 +3,7 @@
 
 
 /*-
- * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC)
+ * SPDX-License-Identifier: (BSD-2-Clause AND ISC)
  *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/include/netconfig.h b/include/netconfig.h
index b459e2ee0bf2..c4aec6a3e791 100644
--- a/include/netconfig.h
+++ b/include/netconfig.h
@@ -2,7 +2,7 @@
 /*	$FreeBSD$ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/include/nl_types.h b/include/nl_types.h
index bf88144aefd4..c07352e24096 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/include/nsswitch.h b/include/nsswitch.h
index 2be7a59fd1b9..e44a9e4a44a3 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -2,7 +2,7 @@
 /*	$FreeBSD$ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/include/stringlist.h b/include/stringlist.h
index b570e631b526..a5177e235a5d 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
diff --git a/include/wchar.h b/include/wchar.h
index 78f2f010048f..147efb4dbf86 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause-NetBSD)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause)
  *
  * Copyright (c)1999 Citrus Project,
  * All rights reserved.
diff --git a/lib/libc/arm/gen/arm_initfini.c b/lib/libc/arm/gen/arm_initfini.c
index 4dabe6743c9f..a54646eb7907 100644
--- a/lib/libc/arm/gen/arm_initfini.c
+++ b/lib/libc/arm/gen/arm_initfini.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * Copyright (c) 2013 Andrew Turner
diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c
index 421cf0dd3ed2..ad3f97184fd0 100644
--- a/lib/libc/arm/gen/makecontext.c
+++ b/lib/libc/arm/gen/makecontext.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: makecontext.c,v 1.2 2003/01/18 11:06:24 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
index a772f50e51c8..42809bb04c58 100644
--- a/lib/libc/gen/fmtcheck.c
+++ b/lib/libc/gen/fmtcheck.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index 20f016dd1694..85110387fbe3 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: lockf.c,v 1.3 2008/04/28 20:22:59 martin Exp $	*/
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/mips/gen/makecontext.c b/lib/libc/mips/gen/makecontext.c
index 7d3e647b4d09..ce964d050866 100644
--- a/lib/libc/mips/gen/makecontext.c
+++ b/lib/libc/mips/gen/makecontext.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index ada7ac606e15..d2d9f08b6efa 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
index 946aace3a8a8..bd3c02dcacf4 100644
--- a/lib/libc/net/nslexer.l
+++ b/lib/libc/net/nslexer.l
@@ -2,7 +2,7 @@
 /*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
index 6e90fc73d8c9..b05b30d26bd0 100644
--- a/lib/libc/net/nsparser.y
+++ b/lib/libc/net/nsparser.y
@@ -2,7 +2,7 @@
 /*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c
index b8c813e8bb84..76820e6807d7 100644
--- a/lib/libc/powerpc/gen/fpgetmask.c
+++ b/lib/libc/powerpc/gen/fpgetmask.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c
index 062a565cc570..b40016447246 100644
--- a/lib/libc/powerpc/gen/fpgetround.c
+++ b/lib/libc/powerpc/gen/fpgetround.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c
index e556123251ec..0c25a270f27e 100644
--- a/lib/libc/powerpc/gen/fpgetsticky.c
+++ b/lib/libc/powerpc/gen/fpgetsticky.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c
index f5d52eec5482..36c46f12dcd9 100644
--- a/lib/libc/powerpc/gen/fpsetmask.c
+++ b/lib/libc/powerpc/gen/fpsetmask.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c
index d1cc134760a5..9a1956113c85 100644
--- a/lib/libc/powerpc/gen/fpsetround.c
+++ b/lib/libc/powerpc/gen/fpsetround.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc64/gen/flt_rounds.c b/lib/libc/powerpc64/gen/flt_rounds.c
index 39af35c77e1c..885942a1389a 100644
--- a/lib/libc/powerpc64/gen/flt_rounds.c
+++ b/lib/libc/powerpc64/gen/flt_rounds.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1996 Mark Brinicombe
  * All rights reserved.
diff --git a/lib/libc/powerpc64/gen/fpgetmask.c b/lib/libc/powerpc64/gen/fpgetmask.c
index b8c813e8bb84..76820e6807d7 100644
--- a/lib/libc/powerpc64/gen/fpgetmask.c
+++ b/lib/libc/powerpc64/gen/fpgetmask.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc64/gen/fpgetround.c b/lib/libc/powerpc64/gen/fpgetround.c
index 062a565cc570..b40016447246 100644
--- a/lib/libc/powerpc64/gen/fpgetround.c
+++ b/lib/libc/powerpc64/gen/fpgetround.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc64/gen/fpgetsticky.c b/lib/libc/powerpc64/gen/fpgetsticky.c
index e556123251ec..0c25a270f27e 100644
--- a/lib/libc/powerpc64/gen/fpgetsticky.c
+++ b/lib/libc/powerpc64/gen/fpgetsticky.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/powerpc64/gen/fpsetmask.c b/lib/libc/powerpc64/gen/fpsetmask.c
index f5d52eec5482..36c46f12dcd9 100644
--- a/lib/libc/powerpc64/gen/fpsetmask.c
+++ b/lib/libc/powerpc64/gen/fpsetmask.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
index 2fe4c12c589d..71ea2ac99621 100644
--- a/lib/libc/softfloat/fpgetmask.c
+++ b/lib/libc/softfloat/fpgetmask.c
@@ -1,7 +1,7 @@
 /* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
index 0f15f2ae4517..c5bc6f9b6735 100644
--- a/lib/libc/softfloat/fpgetround.c
+++ b/lib/libc/softfloat/fpgetround.c
@@ -1,7 +1,7 @@
 /* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
index 8ac7b90e9647..349657e25eb3 100644
--- a/lib/libc/softfloat/fpgetsticky.c
+++ b/lib/libc/softfloat/fpgetsticky.c
@@ -1,7 +1,7 @@
 /* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
index afbe64b2ee7f..42025e1de3c3 100644
--- a/lib/libc/softfloat/fpsetmask.c
+++ b/lib/libc/softfloat/fpsetmask.c
@@ -1,7 +1,7 @@
 /* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
index 54df295000a4..8305e4302e2d 100644
--- a/lib/libc/softfloat/fpsetround.c
+++ b/lib/libc/softfloat/fpsetround.c
@@ -1,7 +1,7 @@
 /* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
index 33c17120d33d..b71475096d10 100644
--- a/lib/libc/softfloat/fpsetsticky.c
+++ b/lib/libc/softfloat/fpsetsticky.c
@@ -1,7 +1,7 @@
 /* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libnetbsd/stdlib.h b/lib/libnetbsd/stdlib.h
index b7bb875740d5..1ccc18b3ec49 100644
--- a/lib/libnetbsd/stdlib.h
+++ b/lib/libnetbsd/stdlib.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2012 SRI International
  * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
diff --git a/lib/libnetbsd/strsuftoll.c b/lib/libnetbsd/strsuftoll.c
index 078bee0ace58..5b2d0978c083 100644
--- a/lib/libnetbsd/strsuftoll.c
+++ b/lib/libnetbsd/strsuftoll.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: strsuftoll.c,v 1.6 2004/03/05 05:58:29 lukem Exp $	*/
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c
index cad320562eee..944edbb60d64 100644
--- a/lib/libusbhid/data.c
+++ b/lib/libusbhid/data.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: data.c,v 1.8 2000/04/02 11:10:53 augustss Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index 7cd6750ad322..c340fe1ef402 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: descr.c,v 1.9 2000/09/24 02:13:24 augustss Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c
index 237319269a2c..fdcc7dbac061 100644
--- a/lib/libusbhid/descr_compat.c
+++ b/lib/libusbhid/descr_compat.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c
index 2913de594200..2f677172be02 100644
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: parse.c,v 1.11 2000/09/24 02:19:54 augustss Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999, 2001 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c
index fba9c668bd33..6317567248d0 100644
--- a/lib/libusbhid/usage.c
+++ b/lib/libusbhid/usage.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: usage.c,v 1.8 2000/10/10 19:23:58 is Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h
index 971884ba8ee9..1b0676426ef9 100644
--- a/lib/libusbhid/usbhid.h
+++ b/lib/libusbhid/usbhid.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: usb.h,v 1.8 2000/08/13 22:22:02 augustss Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h
index 0dfd596e8bb0..32fcabd0ab39 100644
--- a/lib/libusbhid/usbvar.h
+++ b/lib/libusbhid/usbvar.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
  * All rights reserved.
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 5d015481a9e2..209d74af59af 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c
index 56985ef51d8d..7fd6251c7dd5 100644
--- a/libexec/rtld-elf/powerpc/reloc.c
+++ b/libexec/rtld-elf/powerpc/reloc.c
@@ -1,7 +1,7 @@
 /*      $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $   */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 1998   Tsubai Masanari
  * All rights reserved.
diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c
index 93907ebd97d3..732d6ddff7c9 100644
--- a/libexec/rtld-elf/powerpc64/reloc.c
+++ b/libexec/rtld-elf/powerpc64/reloc.c
@@ -1,7 +1,7 @@
 /*      $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $   */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 1998   Tsubai Masanari
  * All rights reserved.
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 85f2e8658fe8..0fdcdb196294 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998 Kenneth D. Merry.
  * All rights reserved.
diff --git a/sbin/camcontrol/progress.c b/sbin/camcontrol/progress.c
index 054b3f5391e7..c620b577416a 100644
--- a/sbin/camcontrol/progress.c
+++ b/sbin/camcontrol/progress.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sbin/camcontrol/progress.h b/sbin/camcontrol/progress.h
index 1234c1136eaf..f49857f57de6 100644
--- a/sbin/camcontrol/progress.h
+++ b/sbin/camcontrol/progress.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997-2012 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h
index 85791ddbfcff..83392b665f44 100644
--- a/sbin/ccdconfig/pathnames.h
+++ b/sbin/ccdconfig/pathnames.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
index c7ff6fb2c48c..2e455f468bb3 100644
--- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c
+++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000 Andrzej Bialecki <abial@freebsd.org>
  * All rights reserved.
diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c
index d0b038c8339d..294d2fbb636f 100644
--- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c
+++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2006, Max Laier <mlaier@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h
index d8c1ce8a6cb9..e3f9b52ed089 100644
--- a/sys/arm/include/_inttypes.h
+++ b/sys/arm/include/_inttypes.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h
index 2032b7368143..e1803060e51a 100644
--- a/sys/arm/include/_stdint.h
+++ b/sys/arm/include/_stdint.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h
index d716f4f01a17..a4b59b6ed95d 100644
--- a/sys/arm/include/bus_dma.h
+++ b/sys/arm/include/bus_dma.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/arm/include/ucontext.h b/sys/arm/include/ucontext.h
index 2fdc5b68230b..969327d015d0 100644
--- a/sys/arm/include/ucontext.h
+++ b/sys/arm/include/ucontext.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: mcontext.h,v 1.4 2003/10/08 22:43:01 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 1c893737f8a6..5628aa495593 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -1,7 +1,7 @@
 /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */
 /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * Copyright (c) 2015 The FreeBSD Foundation
diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c
index 1a9f6cca22e0..0497fb98edb8 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/bhnd/cores/usb/bhnd_ohci.c b/sys/dev/bhnd/cores/usb/bhnd_ohci.c
index 0308562e7ae6..117fc305d1b5 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_ohci.c
+++ b/sys/dev/bhnd/cores/usb/bhnd_ohci.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
diff --git a/sys/dev/esp/am53c974reg.h b/sys/dev/esp/am53c974reg.h
index 795aa88d1668..23e404640b63 100644
--- a/sys/dev/esp/am53c974reg.h
+++ b/sys/dev/esp/am53c974reg.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: pcscpreg.h,v 1.2 2008/04/28 20:23:55 martin Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/esp/esp_pci.c b/sys/dev/esp/esp_pci.c
*** 2110 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307252048.36PKmh50063638>