From b61a573019428cbdc38ed03be9ecd2482011ea66 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 10 May 2023 09:40:58 -0600 Subject: [PATCH] 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 --- 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/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/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/mv88e151x.c | 2 +- sys/dev/mii/mv88e151xreg.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_c2xxx/qat.c | 2 +- sys/dev/qat_c2xxx/qat_ae.c | 2 +- sys/dev/qat_c2xxx/qat_aevar.h | 2 +- sys/dev/qat_c2xxx/qat_c2xxx.c | 2 +- sys/dev/qat_c2xxx/qat_c2xxxreg.h | 2 +- sys/dev/qat_c2xxx/qat_hw15.c | 2 +- sys/dev/qat_c2xxx/qat_hw15reg.h | 2 +- sys/dev/qat_c2xxx/qat_hw15var.h | 2 +- sys/dev/qat_c2xxx/qatreg.h | 2 +- sys/dev/qat_c2xxx/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/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 +- 211 files changed, 211 insertions(+), 211 deletions(-) diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c index 6d8f29147a0..93349ecdafe 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 diff --git a/include/getopt.h b/include/getopt.h index 789b4d1d434..4c0399db854 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 e8c38d84dcc..a06b69d3241 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 b459e2ee0bf..c4aec6a3e79 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 bf88144aefd..c07352e2409 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 0db8a811859..79f6bd2145e 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 b570e631b52..a5177e235a5 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 78f2f010048..147efb4dbf8 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 4dabe6743c9..a54646eb790 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 421cf0dd3ed..ad3f97184fd 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 a772f50e51c..42809bb04c5 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 20f016dd169..85110387fbe 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/net/nsdispatch.c b/lib/libc/net/nsdispatch.c index ada7ac606e1..d2d9f08b6ef 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 946aace3a8a..bd3c02dcacf 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 6e90fc73d8c..b05b30d26bd 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 b8c813e8bb8..76820e6807d 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 062a565cc57..b4001644724 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 e556123251e..0c25a270f27 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 f5d52eec548..36c46f12dcd 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 d1cc134760a..9a1956113c8 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 39af35c77e1..885942a1389 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 b8c813e8bb8..76820e6807d 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 062a565cc57..b4001644724 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 e556123251e..0c25a270f27 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 f5d52eec548..36c46f12dcd 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 2fe4c12c589..71ea2ac9962 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 0f15f2ae451..c5bc6f9b673 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 8ac7b90e964..349657e25eb 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 afbe64b2ee7..42025e1de3c 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 54df295000a..8305e4302e2 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 33c17120d33..b71475096d1 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 b7bb875740d..1ccc18b3ec4 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 078bee0ace5..5b2d0978c08 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 cad320562ee..944edbb60d6 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 * All rights reserved. diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c index 7cd6750ad32..c340fe1ef40 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 * All rights reserved. diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c index 237319269a2..fdcc7dbac06 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 * All rights reserved. diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c index 2913de59420..2f677172be0 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 * All rights reserved. diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c index fba9c668bd3..6317567248d 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 * All rights reserved. diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h index 971884ba8ee..1b0676426ef 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 * All rights reserved. diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h index 0dfd596e8bb..32fcabd0ab3 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 * All rights reserved. diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 5d015481a9e..209d74af59a 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 ab09b1536d8..27796cb1827 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 1dcdd247840..2ca361168e0 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 b84587df7a3..53a0e1af4bf 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 054b3f5391e..c620b577416 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 1234c1136ea..f49857f57de 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 85791ddbfcf..83392b665f4 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 c7ff6fb2c48..2e455f468bb 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 * All rights reserved. diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c index d0b038c8339..294d2fbb636 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 * All rights reserved. diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h index d8c1ce8a6cb..e3f9b52ed08 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 2032b736814..e1803060e51 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 * Copyright (c) 2001 The NetBSD Foundation, Inc. diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h index d716f4f01a1..a4b59b6ed95 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 2fdc5b68230..969327d015d 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 1c893737f8a..5628aa49559 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 1a9f6cca22e..0497fb98edb 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 07b12a19e17..62ad2d04717 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 diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index f7d9dc64111..3c80e7b2e70 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1995, David Greenman * Copyright (c) 2001 Jonathan Lemon diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h index 6b5f3d8b40a..cf4e4277b73 100644 --- a/sys/dev/fxp/if_fxpreg.h +++ b/sys/dev/fxp/if_fxpreg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1995, David Greenman * Copyright (c) 2001 Jonathan Lemon diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c index a976cb739b6..c05542ba69e 100644 --- a/sys/dev/gem/if_gem.c +++ b/sys/dev/gem/if_gem.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2001 Eduardo Horvath. * Copyright (c) 2001-2003 Thomas Moestl diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c index 17ad97fd886..c910ee3cb57 100644 --- a/sys/dev/gem/if_gem_pci.c +++ b/sys/dev/gem/if_gem_pci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2001 Eduardo Horvath. * Copyright (c) 2007 Marius Strobl diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h index aaf5f8b11ef..9ffe3bf96b4 100644 --- a/sys/dev/gem/if_gemreg.h +++ b/sys/dev/gem/if_gemreg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2001 Eduardo Horvath. * All rights reserved. diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h index 69542ae0f5a..0f2d79e4ef8 100644 --- a/sys/dev/gem/if_gemvar.h +++ b/sys/dev/gem/if_gemvar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2001 Eduardo Horvath. * All rights reserved. diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c index 9736498cc3c..cd7fb6bf877 100644 --- a/sys/dev/hid/hid.c +++ b/sys/dev/hid/hid.c @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* $NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem 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/hid/hid.h b/sys/dev/hid/hid.h index 1832af0a4ff..5af470df61d 100644 --- a/sys/dev/hid/hid.h +++ b/sys/dev/hid/hid.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. diff --git a/sys/dev/hid/hidquirk.c b/sys/dev/hid/hidquirk.c index dfb97a3e559..0b5da9479bf 100644 --- a/sys/dev/hid/hidquirk.c +++ b/sys/dev/hid/hidquirk.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index 51db914a5d9..dd20aba3e58 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.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. * All rights reserved. diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index e233ccd5b6d..6d9ad52469b 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -2,7 +2,7 @@ __FBSDID("$FreeBSD$"); /*- - * 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/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c index ac3fc856a8e..c6df70acfc6 100644 --- a/sys/dev/iicbus/s35390a.c +++ b/sys/dev/iicbus/s35390a.c @@ -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) 2012 Yusuke Tanaka * All rights reserved. diff --git a/sys/dev/le/am7990.c b/sys/dev/le/am7990.c index b3d81cf0142..79c780cc8f4 100644 --- a/sys/dev/le/am7990.c +++ b/sys/dev/le/am7990.c @@ -1,7 +1,7 @@ /* $NetBSD: am7990.c,v 1.68 2005/12/11 12:21:25 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/am79900.c b/sys/dev/le/am79900.c index a3b7a8245d0..cee7361654a 100644 --- a/sys/dev/le/am79900.c +++ b/sys/dev/le/am79900.c @@ -1,7 +1,7 @@ /* $NetBSD: am79900.c,v 1.17 2005/12/24 20:27:29 perry Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/am79900reg.h b/sys/dev/le/am79900reg.h index a2de33b3a89..e46d3b894c2 100644 --- a/sys/dev/le/am79900reg.h +++ b/sys/dev/le/am79900reg.h @@ -1,7 +1,7 @@ /* $NetBSD: am79900reg.h,v 1.8 2005/12/11 12:21:25 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/am79900var.h b/sys/dev/le/am79900var.h index d14fb9090a5..82f0414bc93 100644 --- a/sys/dev/le/am79900var.h +++ b/sys/dev/le/am79900var.h @@ -1,7 +1,7 @@ /* $NetBSD: am79900var.h,v 1.4 2005/12/11 12:21:25 christos 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/le/am7990var.h b/sys/dev/le/am7990var.h index 59a7d5455a3..32c7b9b922c 100644 --- a/sys/dev/le/am7990var.h +++ b/sys/dev/le/am7990var.h @@ -1,7 +1,7 @@ /* $NetBSD: am7990var.h,v 1.23 2005/12/11 12:21:25 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/if_le_isa.c b/sys/dev/le/if_le_isa.c index 959b79b9832..def95f6f5f9 100644 --- a/sys/dev/le/if_le_isa.c +++ b/sys/dev/le/if_le_isa.c @@ -1,7 +1,7 @@ /* $NetBSD: if_le_isa.c,v 1.41 2005/12/24 20:27:41 perry Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/if_le_pci.c b/sys/dev/le/if_le_pci.c index 2d8df29fdd0..f3caec00224 100644 --- a/sys/dev/le/if_le_pci.c +++ b/sys/dev/le/if_le_pci.c @@ -1,7 +1,7 @@ /* $NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c index 050fcfe3618..c10ebb074e6 100644 --- a/sys/dev/le/lance.c +++ b/sys/dev/le/lance.c @@ -1,7 +1,7 @@ /* $NetBSD: lance.c,v 1.34 2005/12/24 20:27:30 perry Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/lancereg.h b/sys/dev/le/lancereg.h index b4922b4b90b..ef93db01e5e 100644 --- a/sys/dev/le/lancereg.h +++ b/sys/dev/le/lancereg.h @@ -1,7 +1,7 @@ /* $NetBSD: lancereg.h,v 1.12 2005/12/11 12:21:27 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/le/lancevar.h b/sys/dev/le/lancevar.h index 87b5f3c748f..79eb940de78 100644 --- a/sys/dev/le/lancevar.h +++ b/sys/dev/le/lancevar.h @@ -1,7 +1,7 @@ /* $NetBSD: lancevar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index 65999b4edb6..64d6564c70d 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c index 9822df4bf30..e289a1c1928 100644 --- a/sys/dev/mii/bmtphy.c +++ b/sys/dev/mii/bmtphy.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/bmtphyreg.h b/sys/dev/mii/bmtphyreg.h index 66bb4c9f2ec..bc04ffc4ec2 100644 --- a/sys/dev/mii/bmtphyreg.h +++ b/sys/dev/mii/bmtphyreg.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/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c index f803fcfb132..4e78b2da75d 100644 --- a/sys/dev/mii/e1000phy.c +++ b/sys/dev/mii/e1000phy.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Principal Author: Parag Patel * Copyright (c) 2001 diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c index fa4fa773d99..fcec0e9ede5 100644 --- a/sys/dev/mii/gentbi.c +++ b/sys/dev/mii/gentbi.c @@ -1,7 +1,7 @@ /* $NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c index 58ceda21d82..072da992dfa 100644 --- a/sys/dev/mii/icsphy.c +++ b/sys/dev/mii/icsphy.c @@ -1,7 +1,7 @@ /* $NetBSD: icsphy.c,v 1.41 2006/11/16 21:24:07 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/icsphyreg.h b/sys/dev/mii/icsphyreg.h index fc2d1f267e4..1f2f5a50d94 100644 --- a/sys/dev/mii/icsphyreg.h +++ b/sys/dev/mii/icsphyreg.h @@ -1,7 +1,7 @@ /* $NetBSD: icsphyreg.h,v 1.2 2003/07/01 22:46:08 msaitoh 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/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index acb50c332ed..f460539a71b 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -2,7 +2,7 @@ /* NetBSD: lxtphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/lxtphyreg.h b/sys/dev/mii/lxtphyreg.h index acf15ae0731..76336632366 100644 --- a/sys/dev/mii/lxtphyreg.h +++ b/sys/dev/mii/lxtphyreg.h @@ -3,7 +3,7 @@ /* $FreeBSD$ */ /*- - * 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/mii/mii.c b/sys/dev/mii/mii.c index fe56f92c419..b71473f38c5 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -1,7 +1,7 @@ /* $NetBSD: mii.c,v 1.12 1999/08/03 19:41:49 drochner 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/mii/mii_bitbang.c b/sys/dev/mii/mii_bitbang.c index 8fcf1972934..ea733640190 100644 --- a/sys/dev/mii/mii_bitbang.c +++ b/sys/dev/mii/mii_bitbang.c @@ -1,7 +1,7 @@ /* $NetBSD: mii_bitbang.c,v 1.12 2008/05/04 17:06:09 xtraeme 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/sys/dev/mii/mii_bitbang.h b/sys/dev/mii/mii_bitbang.h index 14e2c90fa49..19c29ed93da 100644 --- a/sys/dev/mii/mii_bitbang.h +++ b/sys/dev/mii/mii_bitbang.h @@ -1,7 +1,7 @@ /* $NetBSD: mii_bitbang.h,v 1.6 2009/05/12 14:31:27 cegger 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/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index 4ddb7d62165..af9b880d288 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,7 +1,7 @@ /* $NetBSD: mii_physubr.c,v 1.5 1999/08/03 19:41:49 drochner Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index a4fdd22db07..9326e379f2f 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -1,7 +1,7 @@ /* $NetBSD: miivar.h,v 1.8 1999/04/23 04:24:32 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/mv88e151x.c b/sys/dev/mii/mv88e151x.c index ad51fefb03c..a99cd0c4cee 100644 --- a/sys/dev/mii/mv88e151x.c +++ b/sys/dev/mii/mv88e151x.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Rubicon Communications, LLC (Netgate) * All rights reserved. diff --git a/sys/dev/mii/mv88e151xreg.h b/sys/dev/mii/mv88e151xreg.h index 95e17caaa83..ca8a49f0514 100644 --- a/sys/dev/mii/mv88e151xreg.h +++ b/sys/dev/mii/mv88e151xreg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Rubicon Communications, LLC (Netgate). * All rights reserved. diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 92b0013a7c9..2eb26f615d4 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -1,7 +1,7 @@ /* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h index cc9ad445984..dff52633760 100644 --- a/sys/dev/mii/nsphyreg.h +++ b/sys/dev/mii/nsphyreg.h @@ -1,7 +1,7 @@ /* $NetBSD: nsphyreg.h,v 1.1 1998/08/10 23:58:39 thorpej 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/mii/nsphyter.c b/sys/dev/mii/nsphyter.c index b8489c23a28..7fbb284163d 100644 --- a/sys/dev/mii/nsphyter.c +++ b/sys/dev/mii/nsphyter.c @@ -1,7 +1,7 @@ /* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/nsphyterreg.h b/sys/dev/mii/nsphyterreg.h index 1d4cc2ff142..cbc0e13692c 100644 --- a/sys/dev/mii/nsphyterreg.h +++ b/sys/dev/mii/nsphyterreg.h @@ -1,7 +1,7 @@ /* $NetBSD: nsphyterreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 910f0e38ee1..aa6a6e503ad 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -2,7 +2,7 @@ /* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h index eaa566b6c40..20a467853e3 100644 --- a/sys/dev/mii/qsphyreg.h +++ b/sys/dev/mii/qsphyreg.h @@ -3,7 +3,7 @@ /* $FreeBSD$ */ /*- - * 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/mii/ukphy.c b/sys/dev/mii/ukphy.c index 9a5233ff3f8..e522446aa71 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -1,7 +1,7 @@ /* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c index b83b8e8a29f..d7bd3bfb269 100644 --- a/sys/dev/mii/ukphy_subr.c +++ b/sys/dev/mii/ukphy_subr.c @@ -1,7 +1,7 @@ /* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej 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/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h index fe4e8b1a158..a7c2ace3d31 100644 --- a/sys/dev/ofw/ofw_pci.h +++ b/sys/dev/ofw/ofw_pci.h @@ -1,5 +1,5 @@ /*- - * 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/sys/dev/qat_c2xxx/qat.c b/sys/dev/qat_c2xxx/qat.c index 00c01f2d0f4..7037a54f1aa 100644 --- a/sys/dev/qat_c2xxx/qat.c +++ b/sys/dev/qat_c2xxx/qat.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat.c,v 1.6 2020/06/14 23:23:12 riastradh Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_ae.c b/sys/dev/qat_c2xxx/qat_ae.c index 85306970607..fbbf1698bde 100644 --- a/sys/dev/qat_c2xxx/qat_ae.c +++ b/sys/dev/qat_c2xxx/qat_ae.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_ae.c,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_aevar.h b/sys/dev/qat_c2xxx/qat_aevar.h index 4aea6a5f8e9..005275a75b3 100644 --- a/sys/dev/qat_c2xxx/qat_aevar.h +++ b/sys/dev/qat_c2xxx/qat_aevar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_aevar.h,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_c2xxx.c b/sys/dev/qat_c2xxx/qat_c2xxx.c index 60ddafe0757..4921e1b98a0 100644 --- a/sys/dev/qat_c2xxx/qat_c2xxx.c +++ b/sys/dev/qat_c2xxx/qat_c2xxx.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_c2xxx.c,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_c2xxxreg.h b/sys/dev/qat_c2xxx/qat_c2xxxreg.h index f3190cf27d2..90fd6e18503 100644 --- a/sys/dev/qat_c2xxx/qat_c2xxxreg.h +++ b/sys/dev/qat_c2xxx/qat_c2xxxreg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_c2xxxreg.h,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_hw15.c b/sys/dev/qat_c2xxx/qat_hw15.c index aab5be9b647..83a33d4e767 100644 --- a/sys/dev/qat_c2xxx/qat_hw15.c +++ b/sys/dev/qat_c2xxx/qat_hw15.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_hw15.c,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_hw15reg.h b/sys/dev/qat_c2xxx/qat_hw15reg.h index df3fa14a0d8..a32e4ae606d 100644 --- a/sys/dev/qat_c2xxx/qat_hw15reg.h +++ b/sys/dev/qat_c2xxx/qat_hw15reg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_hw15reg.h,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qat_hw15var.h b/sys/dev/qat_c2xxx/qat_hw15var.h index 4939aba7ff1..0606b29b0f7 100644 --- a/sys/dev/qat_c2xxx/qat_hw15var.h +++ b/sys/dev/qat_c2xxx/qat_hw15var.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qat_hw15var.h,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qatreg.h b/sys/dev/qat_c2xxx/qatreg.h index 076354fc610..64d4b34aed6 100644 --- a/sys/dev/qat_c2xxx/qatreg.h +++ b/sys/dev/qat_c2xxx/qatreg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qatreg.h,v 1.1 2019/11/20 09:37:46 hikaru Exp $ */ /* diff --git a/sys/dev/qat_c2xxx/qatvar.h b/sys/dev/qat_c2xxx/qatvar.h index 284b4c27fa0..ef50b655e65 100644 --- a/sys/dev/qat_c2xxx/qatvar.h +++ b/sys/dev/qat_c2xxx/qatvar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause */ +/* SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause */ /* $NetBSD: qatvar.h,v 1.2 2020/03/14 18:08:39 ad Exp $ */ /* diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 29d3fe7249d..7520203a156 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 Mathew Kanner * Copyright (c) 1998 The NetBSD Foundation, Inc. diff --git a/sys/dev/sound/pci/cmireg.h b/sys/dev/sound/pci/cmireg.h index 5b0b8b2cb96..cbba613cf53 100644 --- a/sys/dev/sound/pci/cmireg.h +++ b/sys/dev/sound/pci/cmireg.h @@ -1,5 +1,5 @@ /*- - * 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/sys/dev/sound/pci/via82c686.h b/sys/dev/sound/pci/via82c686.h index 02af2d38937..2a801a39b5b 100644 --- a/sys/dev/sound/pci/via82c686.h +++ b/sys/dev/sound/pci/via82c686.h @@ -1,5 +1,5 @@ /*- - * 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/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index a6722ee5b39..840a24cfe7c 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * 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/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h index 39fd2a7c029..1cba7343d8a 100644 --- a/sys/dev/sound/usb/uaudioreg.h +++ b/sys/dev/sound/usb/uaudioreg.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * 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/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c index 35acf32e3dd..6976b148401 100644 --- a/sys/dev/stge/if_stge.c +++ b/sys/dev/stge/if_stge.c @@ -1,7 +1,7 @@ /* $NetBSD: if_stge.c,v 1.32 2005/12/11 12:22:49 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/stge/if_stgereg.h b/sys/dev/stge/if_stgereg.h index a8a59b96b38..f803300637d 100644 --- a/sys/dev/stge/if_stgereg.h +++ b/sys/dev/stge/if_stgereg.h @@ -1,7 +1,7 @@ /* $NetBSD: if_stgereg.h,v 1.3 2003/02/10 21:10:07 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/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h index e64bdf1d68c..68f68b207be 100644 --- a/sys/dev/usb/controller/ehci.h +++ b/sys/dev/usb/controller/ehci.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * 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/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 3b332516f93..28f426027c0 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.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. * All rights reserved. diff --git a/sys/dev/usb/controller/ehcireg.h b/sys/dev/usb/controller/ehcireg.h index 81939e203df..b7597ac7d19 100644 --- a/sys/dev/usb/controller/ehcireg.h +++ b/sys/dev/usb/controller/ehcireg.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * 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/usb/controller/ohci.h b/sys/dev/usb/controller/ohci.h index 50bc1a7f0dd..515c5059119 100644 --- a/sys/dev/usb/controller/ohci.h +++ b/sys/dev/usb/controller/ohci.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * 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/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index abca9526db5..789926edc6e 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.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. * All rights reserved. diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 42cde9e2d7e..4cf7ee4d2a1 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$"); /*- - * 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/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index 97d649ca13a..0e964da3ef1 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -2,7 +2,7 @@ __FBSDID("$FreeBSD$"); /*- - * 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/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c index 174e1c28ae9..95be0b647da 100644 --- a/sys/dev/usb/input/usbhid.c +++ b/sys/dev/usb/input/usbhid.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) 2019 Vladimir Kondratyev diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 5dcdeb58478..47f4cbb6e0e 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c index ddefd8bd4c9..3871beda091 100644 --- a/sys/dev/usb/serial/ubsa.c +++ b/sys/dev/usb/serial/ubsa.c @@ -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) 2002, Alexander Kabaev . * All rights reserved. diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c index 1e50c7968a4..3005342ad3e 100644 --- a/sys/dev/usb/serial/ubser.c +++ b/sys/dev/usb/serial/ubser.c @@ -8,7 +8,7 @@ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2001-2002, Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index 30a2508d705..9b73ba8c432 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -1,7 +1,7 @@ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2007, Takanori Watanabe * All rights reserved. diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c index 9786c3f9fa7..8ed0381149e 100644 --- a/sys/dev/usb/serial/ufoma.c +++ b/sys/dev/usb/serial/ufoma.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); #define UFOMA_HANDSFREE /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2005, Takanori Watanabe All rights reserved. * Copyright (c) 2003 M. Warner Losh diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c index 00a47aa00ce..20a1bfc80e0 100644 --- a/sys/dev/usb/serial/uftdi.c +++ b/sys/dev/usb/serial/uftdi.c @@ -1,7 +1,7 @@ /* $NetBSD: uftdi.c,v 1.13 2002/09/23 05:51:23 simonb 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/sys/dev/usb/serial/ugensa.c b/sys/dev/usb/serial/ugensa.c index b159c5586ec..f27a208fb55 100644 --- a/sys/dev/usb/serial/ugensa.c +++ b/sys/dev/usb/serial/ugensa.c @@ -2,7 +2,7 @@ /* $NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/uipaq.c b/sys/dev/usb/serial/uipaq.c index 666f7fa48f8..2e90aa8e9fb 100644 --- a/sys/dev/usb/serial/uipaq.c +++ b/sys/dev/usb/serial/uipaq.c @@ -2,7 +2,7 @@ /* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000-2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/ulpt.c b/sys/dev/usb/serial/ulpt.c index 346f95eb9ef..909405936bc 100644 --- a/sys/dev/usb/serial/ulpt.c +++ b/sys/dev/usb/serial/ulpt.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index 7b04988d767..e5131f21373 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2003 M. Warner Losh * diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index 25e5f1975bf..b28d105eab1 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 0615fceeec3..a6775be62c1 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -1,7 +1,7 @@ /* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2001-2003, 2005, 2008 * Shunsuke Akiyama . diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h index 7c1aa37cd0c..306eb035c8c 100644 --- a/sys/dev/usb/serial/usb_serial.h +++ b/sys/dev/usb/serial/usb_serial.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 2001-2002, Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/uvisor.c b/sys/dev/usb/serial/uvisor.c index 7c26f49e7f4..5286aa47213 100644 --- a/sys/dev/usb/serial/uvisor.c +++ b/sys/dev/usb/serial/uvisor.c @@ -14,7 +14,7 @@ */ /*- - * 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/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index 0bef7a10bc6..da7ad714225 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. diff --git a/sys/dev/usb/usb_cdc.h b/sys/dev/usb/usb_cdc.h index d77c24bb7ad..a09fd473034 100644 --- a/sys/dev/usb/usb_cdc.h +++ b/sys/dev/usb/usb_cdc.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * 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/usb/usb_hid.c b/sys/dev/usb/usb_hid.c index abd85b49f00..f2644ce08d7 100644 --- a/sys/dev/usb/usb_hid.c +++ b/sys/dev/usb/usb_hid.c @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* $NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem 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/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index 241832011cf..5fc8f7ac27f 100644 --- a/sys/dev/usb/usb_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. diff --git a/sys/dev/usb/usb_hub_acpi.c b/sys/dev/usb/usb_hub_acpi.c index 7ecb23fbc53..5ff2cc814ca 100644 --- a/sys/dev/usb/usb_hub_acpi.c +++ b/sys/dev/usb/usb_hub_acpi.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. diff --git a/sys/dev/usb/usb_hub_private.h b/sys/dev/usb/usb_hub_private.h index 7f828b84502..84b31257188 100644 --- a/sys/dev/usb/usb_hub_private.h +++ b/sys/dev/usb/usb_hub_private.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h index e85a6958f03..c15b83490f4 100644 --- a/sys/dev/usb/usbhid.h +++ b/sys/dev/usb/usbhid.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c index 753012b0e53..0abfc09e4ba 100644 --- a/sys/dev/xl/xlphy.c +++ b/sys/dev/xl/xlphy.c @@ -1,7 +1,7 @@ /* $NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index eda1c3b12c2..dac77771a2e 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs.h,v 1.26 2007/02/22 06:37:00 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs_fifoops.c b/sys/fs/tmpfs/tmpfs_fifoops.c index 08a15aa85fc..a8a4949529e 100644 --- a/sys/fs/tmpfs/tmpfs_fifoops.c +++ b/sys/fs/tmpfs/tmpfs_fifoops.c @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs_fifoops.c,v 1.5 2005/12/11 12:24:29 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs_fifoops.h b/sys/fs/tmpfs/tmpfs_fifoops.h index 94c1642d4bd..27c844eea79 100644 --- a/sys/fs/tmpfs/tmpfs_fifoops.h +++ b/sys/fs/tmpfs/tmpfs_fifoops.h @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs_fifoops.h,v 1.4 2005/12/03 17:34:44 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 351ca825f20..6eee5ade1d9 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs_subr.c,v 1.35 2007/07/09 21:10:50 ad Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index a856d99e43e..7a88e7deba9 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs_vfsops.c,v 1.10 2005/12/11 12:24:29 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index ea09170661e..4a0d7609186 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs_vnops.c,v 1.39 2007/07/23 15:41:01 jmmv Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/fs/tmpfs/tmpfs_vnops.h b/sys/fs/tmpfs/tmpfs_vnops.h index 26769770119..5a579cc8354 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.h +++ b/sys/fs/tmpfs/tmpfs_vnops.h @@ -1,7 +1,7 @@ /* $NetBSD: tmpfs_vnops.h,v 1.7 2005/12/03 17:34:44 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index adaf4b1db1d..cacf8a17e20 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND BSD-3-Clause) + * SPDX-License-Identifier: (BSD-2-Clause AND BSD-3-Clause) * * Copyright (c) 2003 Poul-Henning Kamp. * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 23c035b282f..892ca7c6a87 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,7 +1,7 @@ /* $NetBSD: bridgestp.c,v 1.5 2003/11/28 08:56:48 keihan Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Jason L. Wright (jason@thought.net) * Copyright (c) 2006 Andrew Thompson (thompsa@FreeBSD.org) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 52b4b478bbc..1ad1a696d46 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1,7 +1,7 @@ /* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c)2005 YAMAMOTO Takashi, * Copyright (c)2008 Andrew Thompson diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h index 629bdc25cfc..168611f80d5 100644 --- a/sys/net/ieee8023ad_lacp.h +++ b/sys/net/ieee8023ad_lacp.h @@ -1,7 +1,7 @@ /* $NetBSD: ieee8023ad_impl.h,v 1.2 2005/12/10 23:21:39 elad Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c)2005 YAMAMOTO Takashi, * All rights reserved. diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index f4be4252a82..af6d02b140a 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.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) 2014, 2018 Andrey V. Elsukov diff --git a/sys/powerpc/fpu/fpu_extern.h b/sys/powerpc/fpu/fpu_extern.h index f3a7fcf71da..d1c0b7dbe67 100644 --- a/sys/powerpc/fpu/fpu_extern.h +++ b/sys/powerpc/fpu/fpu_extern.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1995 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/powerpc/include/bat.h b/sys/powerpc/include/bat.h index 78f8f14d116..641fe2eebf4 100644 --- a/sys/powerpc/include/bat.h +++ b/sys/powerpc/include/bat.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h index 084f2cec685..49168bb1cab 100644 --- a/sys/powerpc/include/bus.h +++ b/sys/powerpc/include/bus.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 AND BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause * * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h index 212d8e3af09..ce9d1adf090 100644 --- a/sys/sys/bus_dma.h +++ b/sys/sys/bus_dma.h @@ -1,7 +1,7 @@ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ /*- - * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND BSD-4-Clause) + * SPDX-License-Identifier: (BSD-2-Clause AND BSD-4-Clause) * * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk index 6c58464e649..54b9c28fe50 100644 --- a/sys/tools/miidevs2h.awk +++ b/sys/tools/miidevs2h.awk @@ -2,7 +2,7 @@ # $NetBSD: devlist2h.awk,v 1.2 1998/09/05 14:42:06 christos Exp $ #- -# SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause +# SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause # # Copyright (c) 1998 The NetBSD Foundation, Inc. # All rights reserved. diff --git a/sys/tools/pccarddevs2h.awk b/sys/tools/pccarddevs2h.awk index 3e09fe45a5e..923e63dbca8 100644 --- a/sys/tools/pccarddevs2h.awk +++ b/sys/tools/pccarddevs2h.awk @@ -3,7 +3,7 @@ # $FreeBSD$ #- -# SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause +# SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause # # Copyright (c) 1998 The NetBSD Foundation, Inc. # All rights reserved. diff --git a/sys/x86/include/_inttypes.h b/sys/x86/include/_inttypes.h index 043fbdc8268..8d10a76b3ad 100644 --- a/sys/x86/include/_inttypes.h +++ b/sys/x86/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/x86/include/bus.h b/sys/x86/include/bus.h index ccd4ba26e38..5b030843a6d 100644 --- a/sys/x86/include/bus.h +++ b/sys/x86/include/bus.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-NetBSDE + * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-ClauseE * * Copyright (c) KATO Takenori, 1999. * diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 3411f4b6b03..367214fe35b 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 Christian Limpach. * Copyright (c) 2004-2006,2008 Kip Macy diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c index 2046a34a2f8..f79bbb56d5c 100644 --- a/usr.bin/gencat/gencat.c +++ b/usr.bin/gencat/gencat.c @@ -4,7 +4,7 @@ /* $NetBSD: gencat.c,v 1.18 2003/10/27 00:12:43 lukem Exp $ */ /*- - * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC) + * SPDX-License-Identifier: (BSD-2-Clause AND ISC) * * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c index a7f64b61d05..560fdd31d6f 100644 --- a/usr.bin/gzip/gzip.c +++ b/usr.bin/gzip/gzip.c @@ -1,7 +1,7 @@ /* $NetBSD: gzip.c,v 1.116 2018/10/27 11:39:12 skrll Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017 * Matthew R. Green diff --git a/usr.bin/gzip/unbzip2.c b/usr.bin/gzip/unbzip2.c index f6807e0c43b..f0b010d60dd 100644 --- a/usr.bin/gzip/unbzip2.c +++ b/usr.bin/gzip/unbzip2.c @@ -1,7 +1,7 @@ /* $NetBSD: unbzip2.c,v 1.14 2017/08/04 07:27:08 mrg Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.bin/gzip/unxz.c b/usr.bin/gzip/unxz.c index 246600fd657..1764358b210 100644 --- a/usr.bin/gzip/unxz.c +++ b/usr.bin/gzip/unxz.c @@ -1,7 +1,7 @@ /* $NetBSD: unxz.c,v 1.8 2018/10/06 16:36:45 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index 7d44576f8b2..f0743074f30 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -1,5 +1,5 @@ /*- - * 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/usr.bin/seq/seq.c b/usr.bin/seq/seq.c index 823e8c2c4da..85fca6e8879 100644 --- a/usr.bin/seq/seq.c +++ b/usr.bin/seq/seq.c @@ -1,6 +1,6 @@ /* $NetBSD: seq.c,v 1.7 2010/05/27 08:40:19 dholland Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 0033ff2258a..40e0b23950a 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index 5f45849f0c5..847f7daa046 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c index ce28de4cce9..984cdebc328 100644 --- a/usr.bin/usbhidctl/usbhid.c +++ b/usr.bin/usbhidctl/usbhid.c @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * 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/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c index bc2458a5141..3d927ba0e83 100644 --- a/usr.bin/ypcat/ypcat.c +++ b/usr.bin/ypcat/ypcat.c @@ -1,7 +1,7 @@ /* $OpenBSD: ypcat.c,v 1.16 2015/02/08 23:40:35 deraadt Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1992, 1993, 1996 Theo de Raadt * All rights reserved. diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c index 791a3e26060..a110abaeafe 100644 --- a/usr.bin/ypmatch/ypmatch.c +++ b/usr.bin/ypmatch/ypmatch.c @@ -2,7 +2,7 @@ /* $NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1992, 1993, 1996 Theo de Raadt * All rights reserved. diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c index 9e752f31800..c2aee21e7d9 100644 --- a/usr.bin/ypwhich/ypwhich.c +++ b/usr.bin/ypwhich/ypwhich.c @@ -2,7 +2,7 @@ /* $NetBSD: ypwhich.c,v 1.6 1996/05/13 02:43:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1992, 1993 Theo de Raadt * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/bnep.c b/usr.sbin/bluetooth/btpand/bnep.c index 16a3faaec4a..9c53a5ff251 100644 --- a/usr.sbin/bluetooth/btpand/bnep.c +++ b/usr.sbin/bluetooth/btpand/bnep.c @@ -1,7 +1,7 @@ /* $NetBSD: bnep.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/bnep.h b/usr.sbin/bluetooth/btpand/bnep.h index 9fc60932e34..e8c85c7b635 100644 --- a/usr.sbin/bluetooth/btpand/bnep.h +++ b/usr.sbin/bluetooth/btpand/bnep.h @@ -1,7 +1,7 @@ /* $NetBSD: bnep.h,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/btpand.c b/usr.sbin/bluetooth/btpand/btpand.c index e24152d92e9..6e215fe3226 100644 --- a/usr.sbin/bluetooth/btpand/btpand.c +++ b/usr.sbin/bluetooth/btpand/btpand.c @@ -1,7 +1,7 @@ /* $NetBSD: btpand.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/btpand.h b/usr.sbin/bluetooth/btpand/btpand.h index 566fac3f60b..db09b581822 100644 --- a/usr.sbin/bluetooth/btpand/btpand.h +++ b/usr.sbin/bluetooth/btpand/btpand.h @@ -1,7 +1,7 @@ /* $NetBSD: btpand.h,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/channel.c b/usr.sbin/bluetooth/btpand/channel.c index a8a0d6ac8a0..abc912db7af 100644 --- a/usr.sbin/bluetooth/btpand/channel.c +++ b/usr.sbin/bluetooth/btpand/channel.c @@ -1,7 +1,7 @@ /* $NetBSD: channel.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/packet.c b/usr.sbin/bluetooth/btpand/packet.c index 8e20696ad44..266dee3c1ba 100644 --- a/usr.sbin/bluetooth/btpand/packet.c +++ b/usr.sbin/bluetooth/btpand/packet.c @@ -1,7 +1,7 @@ /* $NetBSD: packet.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/sdp.c b/usr.sbin/bluetooth/btpand/sdp.c index 82fc5baaf59..3029713f7de 100644 --- a/usr.sbin/bluetooth/btpand/sdp.c +++ b/usr.sbin/bluetooth/btpand/sdp.c @@ -1,7 +1,7 @@ /* $NetBSD: sdp.c,v 1.2 2008/12/06 20:01:14 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/sdp.h b/usr.sbin/bluetooth/btpand/sdp.h index a1a9758edec..1b9337a857b 100644 --- a/usr.sbin/bluetooth/btpand/sdp.h +++ b/usr.sbin/bluetooth/btpand/sdp.h @@ -1,7 +1,7 @@ /* $NetBSD: sdp.h,v 1.2 2008/12/06 20:01:15 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/server.c b/usr.sbin/bluetooth/btpand/server.c index 583017a2d54..d6bec1fb614 100644 --- a/usr.sbin/bluetooth/btpand/server.c +++ b/usr.sbin/bluetooth/btpand/server.c @@ -1,7 +1,7 @@ /* $NetBSD: server.c,v 1.2 2009/01/24 17:29:28 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/bluetooth/btpand/tap.c b/usr.sbin/bluetooth/btpand/tap.c index d9d9a3e90af..c880775ed88 100644 --- a/usr.sbin/bluetooth/btpand/tap.c +++ b/usr.sbin/bluetooth/btpand/tap.c @@ -1,7 +1,7 @@ /* $NetBSD: tap.c,v 1.1 2008/08/17 13:20:57 plunky Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Iain Hibbert * All rights reserved. diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 0c9be827464..7d308802556 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1,7 +1,7 @@ /* $NetBSD: cd9660.c,v 1.56 2019/10/18 04:09:02 msaitoh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index 4cd8cd47167..0bc362c91ed 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -1,7 +1,7 @@ /* $NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/cd9660_conversion.c b/usr.sbin/makefs/cd9660/cd9660_conversion.c index 57a1c62a25b..e21becbab44 100644 --- a/usr.sbin/makefs/cd9660/cd9660_conversion.c +++ b/usr.sbin/makefs/cd9660/cd9660_conversion.c @@ -1,7 +1,7 @@ /* $NetBSD: cd9660_conversion.c,v 1.4 2007/03/14 14:11:17 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/cd9660_debug.c b/usr.sbin/makefs/cd9660/cd9660_debug.c index b1e07fb85f0..9fe85d4e5aa 100644 --- a/usr.sbin/makefs/cd9660/cd9660_debug.c +++ b/usr.sbin/makefs/cd9660/cd9660_debug.c @@ -1,7 +1,7 @@ /* $NetBSD: cd9660_debug.c,v 1.11 2010/10/27 18:51:35 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index f837c0b3c38..e84ea53507b 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -1,7 +1,7 @@ /* $NetBSD: cd9660_eltorito.c,v 1.23 2018/03/28 06:48:55 nonaka Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.h b/usr.sbin/makefs/cd9660/cd9660_eltorito.h index 423fff93ea2..31d49afe1f8 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.h +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.h @@ -1,7 +1,7 @@ /* $NetBSD: cd9660_eltorito.h,v 1.6 2017/01/24 11:22:43 nonaka Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c index da47084961b..6c60ea92fac 100644 --- a/usr.sbin/makefs/cd9660/cd9660_strings.c +++ b/usr.sbin/makefs/cd9660/cd9660_strings.c @@ -1,7 +1,7 @@ /* $NetBSD: cd9660_strings.c,v 1.4 2007/01/16 17:32:05 hubertf Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index 95038320a05..7e3910ceb83 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -1,7 +1,7 @@ /* $NetBSD: cd9660_write.c,v 1.14 2011/01/04 09:48:21 wiz Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index e1b8fc993a3..3b5ee2c51c4 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -1,7 +1,7 @@ /* $NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h index 72323ab695e..6e20c7bf578 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.h +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h @@ -1,7 +1,7 @@ /* $NetBSD: iso9660_rrip.h,v 1.5 2009/01/10 22:06:29 bjh21 Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan * Perez-Rathke and Ram Vedam. All rights reserved. diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c index 43fa60cb037..1f28a3cccd9 100644 --- a/usr.sbin/makefs/ffs/ffs_bswap.c +++ b/usr.sbin/makefs/ffs/ffs_bswap.c @@ -1,7 +1,7 @@ /* $NetBSD: ffs_bswap.c,v 1.28 2004/05/25 14:54:59 hannken Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 Manuel Bouyer. * diff --git a/usr.sbin/makefs/ffs/newfs_extern.h b/usr.sbin/makefs/ffs/newfs_extern.h index 636c86b356f..5da9a09dace 100644 --- a/usr.sbin/makefs/ffs/newfs_extern.h +++ b/usr.sbin/makefs/ffs/newfs_extern.h @@ -2,7 +2,7 @@ /* From: NetBSD: extern.h,v 1.3 2000/12/01 12:03:27 simonb Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Christos Zoulas. All rights reserved. * diff --git a/usr.sbin/makefs/ffs/ufs_bswap.h b/usr.sbin/makefs/ffs/ufs_bswap.h index 49b96990ccb..578426320e7 100644 --- a/usr.sbin/makefs/ffs/ufs_bswap.h +++ b/usr.sbin/makefs/ffs/ufs_bswap.h @@ -1,7 +1,7 @@ /* $NetBSD: ufs_bswap.h,v 1.13 2003/10/05 17:48:50 bouyer Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 Manuel Bouyer. * diff --git a/usr.sbin/rpcbind/util.c b/usr.sbin/rpcbind/util.c index 7662f2357d4..de792fc9f28 100644 --- a/usr.sbin/rpcbind/util.c +++ b/usr.sbin/rpcbind/util.c @@ -4,7 +4,7 @@ */ /*- - * 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/usr.sbin/services_mkdb/extern.h b/usr.sbin/services_mkdb/extern.h index 07c2f227b42..6e194fedefc 100644 --- a/usr.sbin/services_mkdb/extern.h +++ b/usr.sbin/services_mkdb/extern.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.sbin/services_mkdb/services_mkdb.c b/usr.sbin/services_mkdb/services_mkdb.c index 60d5783977d..b77e74c819f 100644 --- a/usr.sbin/services_mkdb/services_mkdb.c +++ b/usr.sbin/services_mkdb/services_mkdb.c @@ -1,7 +1,7 @@ /* $NetBSD: services_mkdb.c,v 1.14 2008/04/28 20:24:17 martin 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/usr.sbin/services_mkdb/uniq.c b/usr.sbin/services_mkdb/uniq.c index c78b01ef27c..e95ecf145b1 100644 --- a/usr.sbin/services_mkdb/uniq.c +++ b/usr.sbin/services_mkdb/uniq.c @@ -1,7 +1,7 @@ /* $NetBSD: uniq.c,v 1.4 2008/04/28 20:24:17 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c index 95153ca48a9..fb6ed90d6b8 100644 --- a/usr.sbin/ypset/ypset.c +++ b/usr.sbin/ypset/ypset.c @@ -2,7 +2,7 @@ /* $NetBSD: ypset.c,v 1.8 1996/05/13 02:46:33 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1992, 1993 Theo de Raadt * All rights reserved.