aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/cp/tests/cp_test.sh2
-rw-r--r--bin/timeout/timeout.12
-rw-r--r--include/bitstring.h2
-rw-r--r--include/complex.h2
-rw-r--r--include/cpio.h2
-rw-r--r--include/elf-hints.h2
-rw-r--r--include/elf.h2
-rw-r--r--include/fmtmsg.h2
-rw-r--r--include/inttypes.h2
-rw-r--r--include/iso646.h2
-rw-r--r--include/kenv.h2
-rw-r--r--include/langinfo.h2
-rw-r--r--include/malloc_np.h2
-rwxr-xr-xinclude/mk-osreldate.sh2
-rw-r--r--include/monetary.h2
-rw-r--r--include/mqueue.h2
-rw-r--r--include/nss.h2
-rw-r--r--include/printf.h2
-rw-r--r--include/proc_service.h2
-rw-r--r--include/rpc/rpcsec_gss.h2
-rw-r--r--include/semaphore.h2
-rw-r--r--include/spawn.h2
-rw-r--r--include/stdalign.h2
-rw-r--r--include/stdbool.h2
-rw-r--r--include/stdnoreturn.h2
-rw-r--r--include/strings.h2
-rw-r--r--include/tgmath.h2
-rw-r--r--include/uchar.h2
-rw-r--r--include/ulimit.h2
-rw-r--r--include/utmpx.h2
-rw-r--r--include/uuid.h2
-rw-r--r--include/varargs.h2
-rw-r--r--include/wordexp.h2
-rw-r--r--include/xlocale.h2
-rw-r--r--include/xlocale/_ctype.h2
-rw-r--r--include/xlocale/_inttypes.h2
-rw-r--r--include/xlocale/_langinfo.h2
-rw-r--r--include/xlocale/_locale.h2
-rw-r--r--include/xlocale/_monetary.h2
-rw-r--r--include/xlocale/_stdio.h2
-rw-r--r--include/xlocale/_stdlib.h2
-rw-r--r--include/xlocale/_string.h2
-rw-r--r--include/xlocale/_time.h2
-rw-r--r--include/xlocale/_uchar.h2
-rw-r--r--include/xlocale/_wchar.h2
-rw-r--r--kerberos5/lib/libgssapi_krb5/gss_krb5.c2
-rw-r--r--kerberos5/lib/libgssapi_krb5/pname_to_uid.c2
-rw-r--r--kerberos5/lib/libgssapi_krb5/prefix.c2
-rw-r--r--kerberos5/lib/libgssapi_ntlm/prefix.c2
-rw-r--r--kerberos5/lib/libgssapi_spnego/freebsd_compat.c2
-rw-r--r--lib/csu/amd64/crt1_c.c2
-rw-r--r--lib/csu/common/crtbrand.S2
-rw-r--r--lib/csu/common/feature_note.S2
-rw-r--r--lib/flua/libjail/jail.3lua2
-rw-r--r--lib/geom/cache/geom_cache.c2
-rw-r--r--lib/geom/concat/geom_concat.c2
-rw-r--r--lib/geom/eli/geom_eli.c2
-rw-r--r--lib/geom/journal/geom_journal.c2
-rw-r--r--lib/geom/journal/geom_journal.h2
-rw-r--r--lib/geom/journal/geom_journal_ufs.c2
-rw-r--r--lib/geom/label/geom_label.c2
-rw-r--r--lib/geom/mirror/geom_mirror.c2
-rw-r--r--lib/geom/mountver/geom_mountver.c2
-rw-r--r--lib/geom/multipath/geom_multipath.c2
-rw-r--r--lib/geom/nop/geom_nop.c2
-rw-r--r--lib/geom/part/geom_part.c2
-rw-r--r--lib/geom/raid/geom_raid.c2
-rw-r--r--lib/geom/raid3/geom_raid3.c2
-rw-r--r--lib/geom/shsec/geom_shsec.c2
-rw-r--r--lib/geom/stripe/geom_stripe.c2
-rw-r--r--lib/geom/virstor/geom_virstor.c2
-rw-r--r--lib/libarchive/config_freebsd.h2
-rw-r--r--lib/libbe/be.c2
-rw-r--r--lib/libbe/be.h2
-rw-r--r--lib/libbe/be_access.c2
-rw-r--r--lib/libbe/be_error.c2
-rw-r--r--lib/libbe/be_impl.h2
-rw-r--r--lib/libbe/be_info.c2
-rw-r--r--lib/libbe/libbe.32
-rwxr-xr-xlib/libbe/tests/be_create.sh2
-rw-r--r--lib/libbe/tests/target_prog.c2
-rw-r--r--lib/libbluetooth/bluetooth.c2
-rw-r--r--lib/libbluetooth/bluetooth.h2
-rw-r--r--lib/libbluetooth/dev.c2
-rw-r--r--lib/libbluetooth/hci.c2
-rw-r--r--lib/libbsdstat/bsdstat.c2
-rw-r--r--lib/libbsdstat/bsdstat.h2
-rw-r--r--lib/libc/aarch64/gen/_get_tp.c2
-rw-r--r--lib/libc/aarch64/static_tls.h2
-rw-r--r--lib/libc/amd64/_fpmath.h2
-rw-r--r--lib/libc/amd64/gen/_get_tp.c2
-rw-r--r--lib/libc/amd64/gen/_set_tp.c2
-rw-r--r--lib/libc/amd64/gen/makecontext.c2
-rw-r--r--lib/libc/amd64/gen/signalcontext.c2
-rw-r--r--lib/libc/amd64/static_tls.h2
-rw-r--r--lib/libc/amd64/string/strcpy.c2
-rw-r--r--lib/libc/amd64/sys/amd64_get_fsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_get_gsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_set_fsbase.c2
-rw-r--r--lib/libc/amd64/sys/amd64_set_gsbase.c2
-rw-r--r--lib/libc/arm/_fpmath.h2
-rw-r--r--lib/libc/arm/aeabi/aeabi_atexit.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_double.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_float.c2
-rw-r--r--lib/libc/arm/aeabi/aeabi_unwind_cpp.c2
-rw-r--r--lib/libc/arm/gen/_get_tp.c2
-rw-r--r--lib/libc/arm/gen/_set_tp.c2
-rw-r--r--lib/libc/arm/gen/flt_rounds.c2
-rw-r--r--lib/libc/arm/gen/getcontextx.c2
-rw-r--r--lib/libc/arm/gen/signalcontext.c2
-rw-r--r--lib/libc/arm/static_tls.h2
-rw-r--r--lib/libc/arm/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/db/mpool/mpool-compat.c2
-rw-r--r--lib/libc/gdtoa/_hdtoa.c2
-rw-r--r--lib/libc/gdtoa/_hldtoa.c2
-rw-r--r--lib/libc/gdtoa/_ldtoa.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisQ.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisd.c2
-rw-r--r--lib/libc/gdtoa/machdep_ldisx.c2
-rw-r--r--lib/libc/gen/__getosreldate.c2
-rw-r--r--lib/libc/gen/_once_stub.c2
-rw-r--r--lib/libc/gen/_pthread_stubs.c2
-rw-r--r--lib/libc/gen/_thread_init.c2
-rw-r--r--lib/libc/gen/arc4random-compat.c2
-rw-r--r--lib/libc/gen/auxv.c2
-rw-r--r--lib/libc/gen/cap_sandboxed.c2
-rw-r--r--lib/libc/gen/clock_getcpuclockid.c2
-rw-r--r--lib/libc/gen/ctermid.c2
-rw-r--r--lib/libc/gen/dirfd.c2
-rw-r--r--lib/libc/gen/dlfcn.c2
-rw-r--r--lib/libc/gen/dup3.c2
-rw-r--r--lib/libc/gen/elf_utils.c2
-rw-r--r--lib/libc/gen/errno.c2
-rw-r--r--lib/libc/gen/fdevname.c2
-rw-r--r--lib/libc/gen/fmtmsg.c2
-rw-r--r--lib/libc/gen/fpclassify.c2
-rw-r--r--lib/libc/gen/frexp.c2
-rw-r--r--lib/libc/gen/ftok.c2
-rw-r--r--lib/libc/gen/getentropy.c2
-rw-r--r--lib/libc/gen/getgrent.c2
-rw-r--r--lib/libc/gen/getpagesizes.c2
-rw-r--r--lib/libc/gen/getpeereid.c2
-rw-r--r--lib/libc/gen/getpwent.c2
-rw-r--r--lib/libc/gen/getutxent.c2
-rw-r--r--lib/libc/gen/isinf.c2
-rw-r--r--lib/libc/gen/isnan.c2
-rw-r--r--lib/libc/gen/libc_dlopen.c2
-rw-r--r--lib/libc/gen/posix_spawn.c2
-rw-r--r--lib/libc/gen/pututxline.c2
-rw-r--r--lib/libc/gen/sem.c2
-rw-r--r--lib/libc/gen/sem_new.c2
-rw-r--r--lib/libc/gen/semctl.c2
-rw-r--r--lib/libc/gen/sysctlnametomib.c2
-rw-r--r--lib/libc/gen/tls.c2
-rw-r--r--lib/libc/gen/ulimit.c2
-rw-r--r--lib/libc/gen/unvis-compat.c2
-rw-r--r--lib/libc/gen/utxdb.c2
-rw-r--r--lib/libc/gen/utxdb.h2
-rw-r--r--lib/libc/gen/waitid.c2
-rw-r--r--lib/libc/gen/wordexp.c2
-rw-r--r--lib/libc/i386/_fpmath.h2
-rw-r--r--lib/libc/i386/gen/_get_tp.c2
-rw-r--r--lib/libc/i386/gen/_set_tp.c2
-rw-r--r--lib/libc/i386/gen/makecontext.c2
-rw-r--r--lib/libc/i386/gen/signalcontext.c2
-rw-r--r--lib/libc/i386/static_tls.h2
-rw-r--r--lib/libc/i386/sys/i386_clr_watch.c2
-rw-r--r--lib/libc/i386/sys/i386_get_fsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_get_gsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_get_ioperm.c2
-rw-r--r--lib/libc/i386/sys/i386_set_fsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_set_gsbase.c2
-rw-r--r--lib/libc/i386/sys/i386_set_ioperm.c2
-rw-r--r--lib/libc/i386/sys/i386_set_watch.c2
-rw-r--r--lib/libc/i386/sys/i386_vm86.c2
-rw-r--r--lib/libc/iconv/__iconv.c2
-rw-r--r--lib/libc/iconv/__iconv_free_list.c2
-rw-r--r--lib/libc/iconv/__iconv_get_list.c2
-rw-r--r--lib/libc/iconv/citrus_lock.h2
-rw-r--r--lib/libc/iconv/iconv-internal.h2
-rw-r--r--lib/libc/iconv/iconv.c2
-rw-r--r--lib/libc/iconv/iconv_canonicalize.c2
-rw-r--r--lib/libc/iconv/iconv_close.c2
-rw-r--r--lib/libc/iconv/iconv_compat.c2
-rw-r--r--lib/libc/iconv/iconv_open.c2
-rw-r--r--lib/libc/iconv/iconv_open_into.c2
-rw-r--r--lib/libc/iconv/iconv_set_relocation_prefix.c2
-rw-r--r--lib/libc/iconv/iconvctl.c2
-rw-r--r--lib/libc/iconv/iconvlist.c2
-rw-r--r--lib/libc/include/compat.h2
-rw-r--r--lib/libc/include/errlst.h2
-rw-r--r--lib/libc/include/fpmath.h2
-rw-r--r--lib/libc/include/namespace.h2
-rw-r--r--lib/libc/include/nscache.h2
-rw-r--r--lib/libc/include/nscachedcli.h2
-rw-r--r--lib/libc/include/nss_tls.h2
-rw-r--r--lib/libc/include/reentrant.h2
-rw-r--r--lib/libc/include/un-namespace.h2
-rw-r--r--lib/libc/locale/btowc.c2
-rw-r--r--lib/libc/locale/c16rtomb.c2
-rw-r--r--lib/libc/locale/c32rtomb.c2
-rw-r--r--lib/libc/locale/cXXrtomb_iconv.h2
-rw-r--r--lib/libc/locale/collate.c2
-rw-r--r--lib/libc/locale/collate.h2
-rw-r--r--lib/libc/locale/collcmp.c2
-rw-r--r--lib/libc/locale/ctype.c2
-rw-r--r--lib/libc/locale/fix_grouping.c2
-rw-r--r--lib/libc/locale/gb18030.c2
-rw-r--r--lib/libc/locale/gb2312.c2
-rw-r--r--lib/libc/locale/ldpart.c2
-rw-r--r--lib/libc/locale/ldpart.h2
-rw-r--r--lib/libc/locale/lmessages.c2
-rw-r--r--lib/libc/locale/lmessages.h2
-rw-r--r--lib/libc/locale/lmonetary.c2
-rw-r--r--lib/libc/locale/lmonetary.h2
-rw-r--r--lib/libc/locale/lnumeric.c2
-rw-r--r--lib/libc/locale/lnumeric.h2
-rw-r--r--lib/libc/locale/mblen.c2
-rw-r--r--lib/libc/locale/mblocal.h2
-rw-r--r--lib/libc/locale/mbrlen.c2
-rw-r--r--lib/libc/locale/mbrtoc16.c2
-rw-r--r--lib/libc/locale/mbrtoc32.c2
-rw-r--r--lib/libc/locale/mbrtocXX_iconv.h2
-rw-r--r--lib/libc/locale/mbrtowc.c2
-rw-r--r--lib/libc/locale/mbsinit.c2
-rw-r--r--lib/libc/locale/mbsnrtowcs.c2
-rw-r--r--lib/libc/locale/mbsrtowcs.c2
-rw-r--r--lib/libc/locale/mbstowcs.c2
-rw-r--r--lib/libc/locale/mbtowc.c2
-rw-r--r--lib/libc/locale/nextwctype.c2
-rw-r--r--lib/libc/locale/nl_langinfo.c2
-rw-r--r--lib/libc/locale/rpmatch.c2
-rw-r--r--lib/libc/locale/runefile.h2
-rw-r--r--lib/libc/locale/setlocale.h2
-rw-r--r--lib/libc/locale/utf8.c2
-rw-r--r--lib/libc/locale/wcrtomb.c2
-rw-r--r--lib/libc/locale/wcsftime.c2
-rw-r--r--lib/libc/locale/wcsnrtombs.c2
-rw-r--r--lib/libc/locale/wcsrtombs.c2
-rw-r--r--lib/libc/locale/wcstod.c2
-rw-r--r--lib/libc/locale/wcstof.c2
-rw-r--r--lib/libc/locale/wcstold.c2
-rw-r--r--lib/libc/locale/wcstombs.c2
-rw-r--r--lib/libc/locale/wctob.c2
-rw-r--r--lib/libc/locale/wctomb.c2
-rw-r--r--lib/libc/locale/wctrans.c2
-rw-r--r--lib/libc/locale/wctype.c2
-rw-r--r--lib/libc/locale/xlocale.c2
-rw-r--r--lib/libc/locale/xlocale_private.h2
-rw-r--r--lib/libc/mips/_fpmath.h2
-rw-r--r--lib/libc/mips/gen/_get_tp.c2
-rw-r--r--lib/libc/mips/gen/_set_tp.c2
-rw-r--r--lib/libc/mips/gen/signalcontext.c2
-rw-r--r--lib/libc/mips/static_tls.h2
-rw-r--r--lib/libc/net/gethostbynis.c2
-rw-r--r--lib/libc/net/gethostnamadr.c2
-rw-r--r--lib/libc/net/getifmaddrs.c2
-rw-r--r--lib/libc/net/getnetbynis.c2
-rw-r--r--lib/libc/net/getnetnamadr.c2
-rw-r--r--lib/libc/net/netdb_private.h2
-rw-r--r--lib/libc/net/nscache.c2
-rw-r--r--lib/libc/net/nscachedcli.c2
-rw-r--r--lib/libc/net/nss_backends.h2
-rw-r--r--lib/libc/net/nss_compat.c2
-rw-r--r--lib/libc/net/ntoh.c2
-rw-r--r--lib/libc/net/sockatmark.c2
-rw-r--r--lib/libc/net/sourcefilter.c2
-rw-r--r--lib/libc/posix1e/acl_branding.c2
-rw-r--r--lib/libc/posix1e/acl_calc_mask.c2
-rw-r--r--lib/libc/posix1e/acl_compat.c2
-rw-r--r--lib/libc/posix1e/acl_copy.c2
-rw-r--r--lib/libc/posix1e/acl_delete.c2
-rw-r--r--lib/libc/posix1e/acl_delete_entry.c2
-rw-r--r--lib/libc/posix1e/acl_entry.c2
-rw-r--r--lib/libc/posix1e/acl_flag.c2
-rw-r--r--lib/libc/posix1e/acl_free.c2
-rw-r--r--lib/libc/posix1e/acl_from_text.c2
-rw-r--r--lib/libc/posix1e/acl_from_text_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_get.c2
-rw-r--r--lib/libc/posix1e/acl_id_to_name.c2
-rw-r--r--lib/libc/posix1e/acl_init.c2
-rw-r--r--lib/libc/posix1e/acl_perm.c2
-rw-r--r--lib/libc/posix1e/acl_set.c2
-rw-r--r--lib/libc/posix1e/acl_strip.c2
-rw-r--r--lib/libc/posix1e/acl_support.c2
-rw-r--r--lib/libc/posix1e/acl_support.h2
-rw-r--r--lib/libc/posix1e/acl_support_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_to_text.c2
-rw-r--r--lib/libc/posix1e/acl_to_text_nfs4.c2
-rw-r--r--lib/libc/posix1e/acl_valid.c2
-rw-r--r--lib/libc/posix1e/extattr.c2
-rw-r--r--lib/libc/posix1e/mac.c2
-rw-r--r--lib/libc/posix1e/mac_exec.c2
-rw-r--r--lib/libc/powerpc/_fpmath.h2
-rw-r--r--lib/libc/powerpc/gen/_get_tp.c2
-rw-r--r--lib/libc/powerpc/gen/_set_tp.c2
-rw-r--r--lib/libc/powerpc/gen/makecontext.c2
-rw-r--r--lib/libc/powerpc/gen/signalcontext.c2
-rw-r--r--lib/libc/powerpc/static_tls.h2
-rw-r--r--lib/libc/powerpc/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/powerpc64/_fpmath.h2
-rw-r--r--lib/libc/powerpc64/gen/_get_tp.c2
-rw-r--r--lib/libc/powerpc64/gen/_set_tp.c2
-rw-r--r--lib/libc/powerpc64/gen/fpsetround.c2
-rw-r--r--lib/libc/powerpc64/gen/makecontext.c2
-rw-r--r--lib/libc/powerpc64/gen/signalcontext.c2
-rw-r--r--lib/libc/powerpc64/static_tls.h2
-rw-r--r--lib/libc/powerpc64/sys/__vdso_gettc.c2
-rw-r--r--lib/libc/resolv/h_errno.c2
-rw-r--r--lib/libc/resolv/res_state.c2
-rw-r--r--lib/libc/riscv/gen/_get_tp.c2
-rw-r--r--lib/libc/riscv/static_tls.h2
-rw-r--r--lib/libc/rpc/mt_misc.h2
-rw-r--r--lib/libc/rpc/rpcsec_gss_stub.c2
-rw-r--r--lib/libc/stdio/dprintf.c2
-rw-r--r--lib/libc/stdio/fcloseall.c2
-rw-r--r--lib/libc/stdio/fgetwc.c2
-rw-r--r--lib/libc/stdio/fgetwln.c2
-rw-r--r--lib/libc/stdio/fgetws.c2
-rw-r--r--lib/libc/stdio/fmemopen.c2
-rw-r--r--lib/libc/stdio/fputwc.c2
-rw-r--r--lib/libc/stdio/fputws.c2
-rw-r--r--lib/libc/stdio/fwide.c2
-rw-r--r--lib/libc/stdio/fwprintf.c2
-rw-r--r--lib/libc/stdio/fwscanf.c2
-rw-r--r--lib/libc/stdio/getdelim.c2
-rw-r--r--lib/libc/stdio/getline.c2
-rw-r--r--lib/libc/stdio/getwc.c2
-rw-r--r--lib/libc/stdio/getwchar.c2
-rw-r--r--lib/libc/stdio/open_memstream.c2
-rw-r--r--lib/libc/stdio/open_wmemstream.c2
-rw-r--r--lib/libc/stdio/putwc.c2
-rw-r--r--lib/libc/stdio/putwchar.c2
-rw-r--r--lib/libc/stdio/swprintf.c2
-rw-r--r--lib/libc/stdio/swscanf.c2
-rw-r--r--lib/libc/stdio/ungetwc.c2
-rw-r--r--lib/libc/stdio/vdprintf.c2
-rw-r--r--lib/libc/stdio/vwprintf.c2
-rw-r--r--lib/libc/stdio/vwscanf.c2
-rw-r--r--lib/libc/stdio/wprintf.c2
-rw-r--r--lib/libc/stdio/wscanf.c2
-rw-r--r--lib/libc/stdio/xprintf_errno.c2
-rw-r--r--lib/libc/stdio/xprintf_hexdump.c2
-rw-r--r--lib/libc/stdio/xprintf_quote.c2
-rw-r--r--lib/libc/stdio/xprintf_vis.c2
-rw-r--r--lib/libc/stdlib/getenv.c2
-rw-r--r--lib/libc/stdlib/hcreate.c2
-rw-r--r--lib/libc/stdlib/imaxabs.c2
-rw-r--r--lib/libc/stdlib/imaxdiv.c2
-rw-r--r--lib/libc/stdlib/llabs.c2
-rw-r--r--lib/libc/stdlib/lldiv.c2
-rw-r--r--lib/libc/stdlib/ptsname.c2
-rw-r--r--lib/libc/stdlib/quick_exit.c2
-rw-r--r--lib/libc/stdlib/reallocf.c2
-rw-r--r--lib/libc/stdlib/strfmon.c2
-rw-r--r--lib/libc/stdlib/strtold.c2
-rw-r--r--lib/libc/stdtime/strptime.c2
-rw-r--r--lib/libc/stdtime/timelocal.c2
-rw-r--r--lib/libc/stdtime/timelocal.h2
-rw-r--r--lib/libc/string/mempcpy.c2
-rw-r--r--lib/libc/string/stpncpy.c2
-rw-r--r--lib/libc/string/strcoll.c2
-rw-r--r--lib/libc/string/strcspn.c2
-rw-r--r--lib/libc/string/strlen.c2
-rw-r--r--lib/libc/string/strnlen.c2
-rw-r--r--lib/libc/string/strspn.c2
-rw-r--r--lib/libc/string/strxfrm.c2
-rw-r--r--lib/libc/string/wcpncpy.c2
-rw-r--r--lib/libc/string/wcscasecmp.c2
-rw-r--r--lib/libc/string/wcscat.c2
-rw-r--r--lib/libc/string/wcschr.c2
-rw-r--r--lib/libc/string/wcscoll.c2
-rw-r--r--lib/libc/string/wcsdup.c2
-rw-r--r--lib/libc/string/wcsncasecmp.c2
-rw-r--r--lib/libc/string/wcsnlen.c2
-rw-r--r--lib/libc/string/wcsrchr.c2
-rw-r--r--lib/libc/string/wcsxfrm.c2
-rw-r--r--lib/libc/string/wmempcpy.c2
-rw-r--r--lib/libc/sys/__vdso_gettimeofday.c2
-rw-r--r--lib/libc/sys/brk.c2
-rw-r--r--lib/libc/sys/clock_gettime.c2
-rw-r--r--lib/libc/sys/closefrom.c2
-rw-r--r--lib/libc/sys/fcntl.c2
-rw-r--r--lib/libc/sys/gettimeofday.c2
-rw-r--r--lib/libc/sys/shm_open.c2
-rw-r--r--lib/libc/sys/sigwait.c2
-rw-r--r--lib/libc/tests/gen/getentropy_test.c2
-rw-r--r--lib/libc/tests/gen/makecontext_test.c2
-rw-r--r--lib/libc/tests/gen/sigsetops_test.c2
-rw-r--r--lib/libc/tests/sys/brk_test.c2
-rw-r--r--lib/libc/uuid/uuid_compare.c2
-rw-r--r--lib/libc/uuid/uuid_create.c2
-rw-r--r--lib/libc/uuid/uuid_create_nil.c2
-rw-r--r--lib/libc/uuid/uuid_equal.c2
-rw-r--r--lib/libc/uuid/uuid_from_string.c2
-rw-r--r--lib/libc/uuid/uuid_hash.c2
-rw-r--r--lib/libc/uuid/uuid_is_nil.c2
-rw-r--r--lib/libc/uuid/uuid_stream.c2
-rw-r--r--lib/libc/uuid/uuid_to_string.c2
-rw-r--r--lib/libc/x86/gen/getcontextx.c2
-rw-r--r--lib/libc_nonshared/__stub.c2
-rw-r--r--lib/libcalendar/calendar.c2
-rw-r--r--lib/libcalendar/calendar.h2
-rw-r--r--lib/libcalendar/easter.c2
-rw-r--r--lib/libcam/camlib.c2
-rw-r--r--lib/libcam/camlib.h2
-rw-r--r--lib/libcasper/libcasper/libcasper.c2
-rw-r--r--lib/libcasper/libcasper/libcasper.h2
-rw-r--r--lib/libcasper/libcasper/libcasper_impl.c2
-rw-r--r--lib/libcasper/libcasper/libcasper_impl.h2
-rw-r--r--lib/libcasper/libcasper/libcasper_service.c2
-rw-r--r--lib/libcasper/libcasper/libcasper_service.h2
-rw-r--r--lib/libcasper/libcasper/service.c2
-rw-r--r--lib/libcasper/libcasper/zygote.c2
-rw-r--r--lib/libcasper/libcasper/zygote.h2
-rw-r--r--lib/libcasper/services/cap_dns/cap_dns.c2
-rw-r--r--lib/libcasper/services/cap_dns/tests/dns_test.c2
-rw-r--r--lib/libcasper/services/cap_fileargs/cap_fileargs.c2
-rw-r--r--lib/libcasper/services/cap_fileargs/cap_fileargs.h2
-rw-r--r--lib/libcasper/services/cap_grp/cap_grp.c2
-rw-r--r--lib/libcasper/services/cap_grp/tests/grp_test.c2
-rw-r--r--lib/libcasper/services/cap_net/cap_net.c2
-rw-r--r--lib/libcasper/services/cap_net/cap_net.h2
-rw-r--r--lib/libcasper/services/cap_pwd/cap_pwd.c2
-rw-r--r--lib/libcasper/services/cap_pwd/tests/pwd_test.c2
-rw-r--r--lib/libcasper/services/cap_sysctl/cap_sysctl.c2
-rw-r--r--lib/libcasper/services/cap_sysctl/tests/sysctl_test.c2
-rw-r--r--lib/libcasper/services/cap_syslog/cap_syslog.c2
-rw-r--r--lib/libcrypt/crypt-md5.c2
-rw-r--r--lib/libcrypt/crypt-nthash.c2
-rw-r--r--lib/libcrypt/crypt-sha256.c2
-rw-r--r--lib/libcrypt/crypt-sha512.c2
-rw-r--r--lib/libcrypt/crypt.c2
-rw-r--r--lib/libcrypt/crypt.h2
-rw-r--r--lib/libdevinfo/devinfo.c2
-rw-r--r--lib/libdevinfo/devinfo.h2
-rw-r--r--lib/libdevinfo/devinfo_var.h2
-rw-r--r--lib/libgeom/geom_util.c2
-rw-r--r--lib/libgssapi/context.h2
-rw-r--r--lib/libgssapi/cred.h2
-rw-r--r--lib/libgssapi/gss_accept_sec_context.c2
-rw-r--r--lib/libgssapi/gss_acquire_cred.c2
-rw-r--r--lib/libgssapi/gss_add_cred.c2
-rw-r--r--lib/libgssapi/gss_add_oid_set_member.c2
-rw-r--r--lib/libgssapi/gss_canonicalize_name.c2
-rw-r--r--lib/libgssapi/gss_compare_name.c2
-rw-r--r--lib/libgssapi/gss_context_time.c2
-rw-r--r--lib/libgssapi/gss_create_empty_oid_set.c2
-rw-r--r--lib/libgssapi/gss_decapsulate_token.c2
-rw-r--r--lib/libgssapi/gss_delete_sec_context.c2
-rw-r--r--lib/libgssapi/gss_display_name.c2
-rw-r--r--lib/libgssapi/gss_duplicate_name.c2
-rw-r--r--lib/libgssapi/gss_duplicate_oid.c2
-rw-r--r--lib/libgssapi/gss_encapsulate_token.c2
-rw-r--r--lib/libgssapi/gss_export_name.c2
-rw-r--r--lib/libgssapi/gss_export_sec_context.c2
-rw-r--r--lib/libgssapi/gss_get_mic.c2
-rw-r--r--lib/libgssapi/gss_import_name.c2
-rw-r--r--lib/libgssapi/gss_import_sec_context.c2
-rw-r--r--lib/libgssapi/gss_indicate_mechs.c2
-rw-r--r--lib/libgssapi/gss_init_sec_context.c2
-rw-r--r--lib/libgssapi/gss_inquire_context.c2
-rw-r--r--lib/libgssapi/gss_inquire_cred.c2
-rw-r--r--lib/libgssapi/gss_inquire_cred_by_mech.c2
-rw-r--r--lib/libgssapi/gss_inquire_mechs_for_name.c2
-rw-r--r--lib/libgssapi/gss_inquire_names_for_mech.c2
-rw-r--r--lib/libgssapi/gss_inquire_sec_context_by_oid.c2
-rw-r--r--lib/libgssapi/gss_krb5.c2
-rw-r--r--lib/libgssapi/gss_mech_switch.c2
-rw-r--r--lib/libgssapi/gss_names.c2
-rw-r--r--lib/libgssapi/gss_pname_to_uid.c2
-rw-r--r--lib/libgssapi/gss_process_context_token.c2
-rw-r--r--lib/libgssapi/gss_release_buffer.c2
-rw-r--r--lib/libgssapi/gss_release_cred.c2
-rw-r--r--lib/libgssapi/gss_release_name.c2
-rw-r--r--lib/libgssapi/gss_release_oid_set.c2
-rw-r--r--lib/libgssapi/gss_seal.c2
-rw-r--r--lib/libgssapi/gss_sign.c2
-rw-r--r--lib/libgssapi/gss_test_oid_set_member.c2
-rw-r--r--lib/libgssapi/gss_unseal.c2
-rw-r--r--lib/libgssapi/gss_unwrap.c2
-rw-r--r--lib/libgssapi/gss_utils.c2
-rw-r--r--lib/libgssapi/gss_verify.c2
-rw-r--r--lib/libgssapi/gss_verify_mic.c2
-rw-r--r--lib/libgssapi/gss_wrap.c2
-rw-r--r--lib/libgssapi/gss_wrap_size_limit.c2
-rw-r--r--lib/libgssapi/mech_switch.h2
-rw-r--r--lib/libgssapi/name.h2
-rw-r--r--lib/libgssapi/spnego.h2
-rw-r--r--lib/libgssapi/utils.h2
-rw-r--r--lib/libiscsiutil/chap.c2
-rw-r--r--lib/libiscsiutil/connection.c2
-rw-r--r--lib/libiscsiutil/keys.c2
-rw-r--r--lib/libiscsiutil/libiscsiutil.h2
-rw-r--r--lib/libiscsiutil/log.c2
-rw-r--r--lib/libiscsiutil/pdu.c2
-rw-r--r--lib/libiscsiutil/text.c2
-rw-r--r--lib/libiscsiutil/utils.c2
-rw-r--r--lib/libjail/jail.c2
-rw-r--r--lib/libjail/jail.h2
-rw-r--r--lib/libjail/jail_getid.c2
-rw-r--r--lib/libkiconv/kiconv_sysctl.c2
-rw-r--r--lib/libkiconv/quirks.c2
-rw-r--r--lib/libkiconv/quirks.h2
-rw-r--r--lib/libkiconv/xlat16_iconv.c2
-rw-r--r--lib/libkvm/kvm_getswapinfo.c2
-rw-r--r--lib/libkvm/kvm_minidump_amd64.c2
-rw-r--r--lib/libkvm/kvm_minidump_arm.c2
-rw-r--r--lib/libkvm/kvm_minidump_i386.c2
-rw-r--r--lib/libkvm/kvm_minidump_mips.c2
-rw-r--r--lib/libkvm/kvm_powerpc64.h2
-rw-r--r--lib/libkvm/kvm_vnet.c2
-rw-r--r--lib/libmemstat/memstat.c2
-rw-r--r--lib/libmemstat/memstat.h2
-rw-r--r--lib/libmemstat/memstat_all.c2
-rw-r--r--lib/libmemstat/memstat_internal.h2
-rw-r--r--lib/libmemstat/memstat_malloc.c2
-rw-r--r--lib/libmemstat/memstat_uma.c2
-rw-r--r--lib/libmp/mpasbn.c2
-rw-r--r--lib/libnetbsd/rmd160.h2
-rw-r--r--lib/libnetbsd/sha1.h2
-rw-r--r--lib/libnetbsd/sha2.h2
-rw-r--r--lib/libnetbsd/util.c2
-rw-r--r--lib/libnetmap/libnetmap.h2
-rw-r--r--lib/libnetmap/nmctx-pthreads.c2
-rw-r--r--lib/libnetmap/nmctx.c2
-rw-r--r--lib/libnetmap/nmport.c2
-rw-r--r--lib/libnetmap/nmreq.c2
-rw-r--r--lib/libnv/common_impl.h2
-rw-r--r--lib/libnv/msgio.c2
-rw-r--r--lib/libnv/msgio.h2
-rw-r--r--lib/libpam/libpam/security/pam_mod_misc.h2
-rw-r--r--lib/libpam/modules/pam_ksu/pam_ksu.c2
-rw-r--r--lib/libpam/modules/pam_permit/pam_permit.c2
-rw-r--r--lib/libpjdlog/pjdlog.c2
-rw-r--r--lib/libpjdlog/pjdlog.h2
-rw-r--r--lib/libpmc/libpmc.c2
-rw-r--r--lib/libpmc/libpmc_json.cc2
-rw-r--r--lib/libpmc/libpmc_pmu_util.c2
-rw-r--r--lib/libpmc/libpmcinternal.h2
-rw-r--r--lib/libpmc/pmc.h2
-rw-r--r--lib/libpmc/pmcformat.h2
-rw-r--r--lib/libpmc/pmclog.c2
-rw-r--r--lib/libpmc/pmclog.h2
-rw-r--r--lib/libproc/_libproc.h2
-rw-r--r--lib/libproc/libproc.h2
-rw-r--r--lib/libproc/proc_bkpt.c2
-rw-r--r--lib/libproc/proc_create.c2
-rw-r--r--lib/libproc/proc_regs.c2
-rw-r--r--lib/libproc/proc_rtld.c2
-rw-r--r--lib/libproc/proc_sym.c2
-rw-r--r--lib/libproc/proc_util.c2
-rw-r--r--lib/libprocstat/common_kvm.h2
-rw-r--r--lib/libprocstat/core.c2
-rw-r--r--lib/libprocstat/core.h2
-rw-r--r--lib/libprocstat/libprocstat.h2
-rw-r--r--lib/libprocstat/libprocstat_internal.h2
-rw-r--r--lib/libprocstat/smbfs.c2
-rw-r--r--lib/libprocstat/udf.c2
-rw-r--r--lib/libprocstat/zfs.c2
-rw-r--r--lib/libprocstat/zfs_defs.c2
-rw-r--r--lib/libprocstat/zfs_defs.h2
-rw-r--r--lib/libradius/radlib.c2
-rw-r--r--lib/libradius/radlib.h2
-rw-r--r--lib/libradius/radlib_private.h2
-rw-r--r--lib/libradius/radlib_vs.h2
-rwxr-xr-xlib/libregex/tests/libregex_test.sh2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_conf.c2
-rw-r--r--lib/librpcsec_gss/rpcsec_gss_misc.c2
-rw-r--r--lib/librt/aio.c2
-rw-r--r--lib/librt/mq.c2
-rw-r--r--lib/librt/sigev_thread.c2
-rw-r--r--lib/librt/sigev_thread.h2
-rw-r--r--lib/librt/timer.c2
-rw-r--r--lib/librtld_db/rtld_db.c2
-rw-r--r--lib/librtld_db/rtld_db.h2
-rw-r--r--lib/libsdp/sdp-int.h2
-rw-r--r--lib/libsdp/sdp.h2
-rw-r--r--lib/libsdp/search.c2
-rw-r--r--lib/libsdp/service.c2
-rw-r--r--lib/libsdp/session.c2
-rw-r--r--lib/libsdp/util.c2
-rw-r--r--lib/libstdbuf/stdbuf.c2
-rw-r--r--lib/libstdthreads/call_once.c2
-rw-r--r--lib/libstdthreads/cnd.c2
-rw-r--r--lib/libstdthreads/mtx.c2
-rw-r--r--lib/libstdthreads/thrd.c2
-rw-r--r--lib/libstdthreads/threads.h2
-rw-r--r--lib/libstdthreads/tss.c2
-rw-r--r--lib/libsysdecode/tests/sysdecode_test.c2
-rw-r--r--lib/libtacplus/taclib.c2
-rw-r--r--lib/libtacplus/taclib.h2
-rw-r--r--lib/libtacplus/taclib_private.h2
-rw-r--r--lib/libthr/arch/aarch64/include/pthread_tls.h2
-rw-r--r--lib/libthr/arch/amd64/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/amd64/include/pthread_tls.h2
-rw-r--r--lib/libthr/arch/arm/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/arm/include/pthread_tls.h2
-rw-r--r--lib/libthr/arch/i386/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/i386/include/pthread_tls.h2
-rw-r--r--lib/libthr/arch/mips/include/pthread_md.h2
-rw-r--r--lib/libthr/arch/mips/include/pthread_tls.h2
-rw-r--r--lib/libthr/arch/powerpc/include/pthread_tls.h2
-rw-r--r--lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S2
-rw-r--r--lib/libthr/arch/riscv/include/pthread_tls.h2
-rw-r--r--lib/libthr/thread/thr_affinity.c2
-rw-r--r--lib/libthr/thread/thr_barrier.c2
-rw-r--r--lib/libthr/thread/thr_barrierattr.c2
-rw-r--r--lib/libthr/thread/thr_cancel.c2
-rw-r--r--lib/libthr/thread/thr_cond.c2
-rw-r--r--lib/libthr/thread/thr_create.c2
-rw-r--r--lib/libthr/thread/thr_detach.c2
-rw-r--r--lib/libthr/thread/thr_event.c2
-rw-r--r--lib/libthr/thread/thr_getcpuclockid.c2
-rw-r--r--lib/libthr/thread/thr_getthreadid_np.c2
-rw-r--r--lib/libthr/thread/thr_join.c2
-rw-r--r--lib/libthr/thread/thr_kern.c2
-rw-r--r--lib/libthr/thread/thr_list.c2
-rw-r--r--lib/libthr/thread/thr_main_np.c2
-rw-r--r--lib/libthr/thread/thr_malloc.c2
-rw-r--r--lib/libthr/thread/thr_once.c2
-rw-r--r--lib/libthr/thread/thr_printf.c2
-rw-r--r--lib/libthr/thread/thr_private.h2
-rw-r--r--lib/libthr/thread/thr_pspinlock.c2
-rw-r--r--lib/libthr/thread/thr_rtld.c2
-rw-r--r--lib/libthr/thread/thr_rwlock.c2
-rw-r--r--lib/libthr/thread/thr_rwlockattr.c2
-rw-r--r--lib/libthr/thread/thr_sem.c2
-rw-r--r--lib/libthr/thread/thr_sig.c2
-rw-r--r--lib/libthr/thread/thr_sleepq.c2
-rw-r--r--lib/libthr/thread/thr_stack.c2
-rw-r--r--lib/libthr/thread/thr_umtx.c2
-rw-r--r--lib/libthr/thread/thr_umtx.h2
-rw-r--r--lib/libthread_db/arch/amd64/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/arm/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/i386/libpthread_md.c2
-rw-r--r--lib/libthread_db/arch/powerpc/libpthread_md.c2
-rw-r--r--lib/libthread_db/kse.h2
-rw-r--r--lib/libthread_db/libpthread_db.c2
-rw-r--r--lib/libthread_db/libpthread_db.h2
-rw-r--r--lib/libthread_db/libthr_db.c2
-rw-r--r--lib/libthread_db/thread_db.c2
-rw-r--r--lib/libthread_db/thread_db.h2
-rw-r--r--lib/libthread_db/thread_db_int.h2
-rw-r--r--lib/libufs/block.c2
-rw-r--r--lib/libufs/cgroup.c2
-rw-r--r--lib/libufs/inode.c2
-rw-r--r--lib/libufs/libufs.h2
-rw-r--r--lib/libufs/sblock.c2
-rw-r--r--lib/libufs/type.c2
-rw-r--r--lib/libugidfw/ugidfw.c2
-rw-r--r--lib/libugidfw/ugidfw.h2
-rw-r--r--lib/libulog/ulog.h2
-rw-r--r--lib/libulog/ulog_login.c2
-rw-r--r--lib/libulog/ulog_login_pseudo.c2
-rw-r--r--lib/libulog/utempter.c2
-rw-r--r--lib/libulog/utempter.h2
-rw-r--r--lib/libusb/libusb.h2
-rw-r--r--lib/libusb/libusb01.c2
-rw-r--r--lib/libusb/libusb10.c2
-rw-r--r--lib/libusb/libusb10.h2
-rw-r--r--lib/libusb/libusb10_desc.c2
-rw-r--r--lib/libusb/libusb10_io.c2
-rw-r--r--lib/libusb/libusb20.c2
-rw-r--r--lib/libusb/libusb20.h2
-rw-r--r--lib/libusb/libusb20_desc.c2
-rw-r--r--lib/libusb/libusb20_desc.h2
-rw-r--r--lib/libusb/libusb20_int.h2
-rw-r--r--lib/libusb/libusb20_ugen20.c2
-rw-r--r--lib/libusb/libusb_global_linux.h2
-rw-r--r--lib/libusb/usb.h2
-rw-r--r--lib/libutil/auth.c2
-rw-r--r--lib/libutil/expand_number.c2
-rw-r--r--lib/libutil/flopen.c2
-rw-r--r--lib/libutil/getlocalbase.32
-rw-r--r--lib/libutil/gr_util.c2
-rw-r--r--lib/libutil/humanize_number.c2
-rw-r--r--lib/libutil/kinfo_getallproc.c2
-rw-r--r--lib/libutil/kinfo_getproc.c2
-rw-r--r--lib/libutil/kld.c2
-rw-r--r--lib/libutil/login_crypt.c2
-rw-r--r--lib/libutil/pidfile.c2
-rw-r--r--lib/libutil/property.c2
-rw-r--r--lib/libutil/quotafile.c2
-rw-r--r--lib/libutil/realhostname.c2
-rw-r--r--lib/libutil/stub.c2
-rw-r--r--lib/libutil/trimdomain.c2
-rw-r--r--lib/libvmmapi/vmmapi.c2
-rw-r--r--lib/libvmmapi/vmmapi.h2
-rw-r--r--lib/libvmmapi/vmmapi_freebsd.c2
-rw-r--r--lib/liby/yyerror.h2
-rw-r--r--lib/libypclnt/ypclnt_passwd.c2
-rw-r--r--lib/msun/amd64/fenv.c2
-rw-r--r--lib/msun/arm/fenv.c2
-rw-r--r--lib/msun/arm/fenv.h2
-rw-r--r--lib/msun/i387/fenv.c2
-rw-r--r--lib/msun/i387/invtrig.c2
-rw-r--r--lib/msun/ld128/invtrig.c2
-rw-r--r--lib/msun/ld128/invtrig.h2
-rw-r--r--lib/msun/ld128/k_expl.h2
-rw-r--r--lib/msun/ld128/s_cexpl.c2
-rw-r--r--lib/msun/ld128/s_exp2l.c2
-rw-r--r--lib/msun/ld128/s_expl.c2
-rw-r--r--lib/msun/ld128/s_logl.c2
-rw-r--r--lib/msun/ld128/s_nanl.c2
-rw-r--r--lib/msun/ld80/invtrig.c2
-rw-r--r--lib/msun/ld80/invtrig.h2
-rw-r--r--lib/msun/ld80/k_expl.h2
-rw-r--r--lib/msun/ld80/s_cexpl.c2
-rw-r--r--lib/msun/ld80/s_exp2l.c2
-rw-r--r--lib/msun/ld80/s_expl.c2
-rw-r--r--lib/msun/ld80/s_logl.c2
-rw-r--r--lib/msun/ld80/s_nanl.c2
-rw-r--r--lib/msun/mips/fenv.c2
-rw-r--r--lib/msun/mips/fenv.h2
-rw-r--r--lib/msun/powerpc/fenv.c2
-rw-r--r--lib/msun/powerpc/fenv.h2
-rw-r--r--lib/msun/src/catrig.c2
-rw-r--r--lib/msun/src/catrigf.c2
-rw-r--r--lib/msun/src/e_remainderl.c2
-rw-r--r--lib/msun/src/e_sqrtl.c2
-rw-r--r--lib/msun/src/fenv-softfloat.h2
-rw-r--r--lib/msun/src/imprecise.c2
-rw-r--r--lib/msun/src/k_exp.c2
-rw-r--r--lib/msun/src/k_expf.c2
-rw-r--r--lib/msun/src/s_carg.c2
-rw-r--r--lib/msun/src/s_cargf.c2
-rw-r--r--lib/msun/src/s_cargl.c2
-rw-r--r--lib/msun/src/s_ccosh.c2
-rw-r--r--lib/msun/src/s_ccoshf.c2
-rw-r--r--lib/msun/src/s_cexp.c2
-rw-r--r--lib/msun/src/s_cexpf.c2
-rw-r--r--lib/msun/src/s_cimag.c2
-rw-r--r--lib/msun/src/s_cimagf.c2
-rw-r--r--lib/msun/src/s_cimagl.c2
-rw-r--r--lib/msun/src/s_conj.c2
-rw-r--r--lib/msun/src/s_conjf.c2
-rw-r--r--lib/msun/src/s_conjl.c2
-rw-r--r--lib/msun/src/s_copysignl.c2
-rw-r--r--lib/msun/src/s_cosl.c2
-rw-r--r--lib/msun/src/s_cproj.c2
-rw-r--r--lib/msun/src/s_cprojf.c2
-rw-r--r--lib/msun/src/s_cprojl.c2
-rw-r--r--lib/msun/src/s_creal.c2
-rw-r--r--lib/msun/src/s_crealf.c2
-rw-r--r--lib/msun/src/s_creall.c2
-rw-r--r--lib/msun/src/s_csinh.c2
-rw-r--r--lib/msun/src/s_csinhf.c2
-rw-r--r--lib/msun/src/s_csqrt.c2
-rw-r--r--lib/msun/src/s_csqrtf.c2
-rw-r--r--lib/msun/src/s_csqrtl.c2
-rw-r--r--lib/msun/src/s_ctanh.c2
-rw-r--r--lib/msun/src/s_ctanhf.c2
-rw-r--r--lib/msun/src/s_exp2.c2
-rw-r--r--lib/msun/src/s_exp2f.c2
-rw-r--r--lib/msun/src/s_fdim.c2
-rw-r--r--lib/msun/src/s_fma.c2
-rw-r--r--lib/msun/src/s_fmaf.c2
-rw-r--r--lib/msun/src/s_fmal.c2
-rw-r--r--lib/msun/src/s_fmax.c2
-rw-r--r--lib/msun/src/s_fmaxf.c2
-rw-r--r--lib/msun/src/s_fmaxl.c2
-rw-r--r--lib/msun/src/s_fmin.c2
-rw-r--r--lib/msun/src/s_fminf.c2
-rw-r--r--lib/msun/src/s_fminl.c2
-rw-r--r--lib/msun/src/s_frexpl.c2
-rw-r--r--lib/msun/src/s_isfinite.c2
-rw-r--r--lib/msun/src/s_isnan.c2
-rw-r--r--lib/msun/src/s_isnormal.c2
-rw-r--r--lib/msun/src/s_lrint.c2
-rw-r--r--lib/msun/src/s_lround.c2
-rw-r--r--lib/msun/src/s_modfl.c2
-rw-r--r--lib/msun/src/s_nan.c2
-rw-r--r--lib/msun/src/s_nearbyint.c2
-rw-r--r--lib/msun/src/s_rintl.c2
-rw-r--r--lib/msun/src/s_round.c2
-rw-r--r--lib/msun/src/s_roundf.c2
-rw-r--r--lib/msun/src/s_roundl.c2
-rw-r--r--lib/msun/src/s_scalbln.c2
-rw-r--r--lib/msun/src/s_signbit.c2
-rw-r--r--lib/msun/src/s_sinl.c2
-rw-r--r--lib/msun/src/s_tanl.c2
-rw-r--r--lib/msun/src/s_tgammaf.c2
-rw-r--r--lib/msun/x86/fenv.h2
-rw-r--r--libexec/atrun/gloadavg.h2
-rw-r--r--libexec/phttpget/phttpget.c2
-rw-r--r--libexec/pppoed/pppoed.c2
-rw-r--r--libexec/rtld-elf/amd64/reloc.c2
-rw-r--r--libexec/rtld-elf/amd64/rtld_machdep.h2
-rw-r--r--libexec/rtld-elf/arm/rtld_machdep.h2
-rw-r--r--libexec/rtld-elf/debug.c2
-rw-r--r--libexec/rtld-elf/debug.h2
-rw-r--r--libexec/rtld-elf/i386/reloc.c2
-rw-r--r--libexec/rtld-elf/i386/rtld_machdep.h2
-rw-r--r--libexec/rtld-elf/map_object.c2
-rw-r--r--libexec/rtld-elf/mips/rtld_machdep.h2
-rw-r--r--libexec/rtld-elf/powerpc/rtld_machdep.h2
-rw-r--r--libexec/rtld-elf/powerpc64/rtld_machdep.h2
-rw-r--r--libexec/rtld-elf/rtld.c2
-rw-r--r--libexec/rtld-elf/rtld.h2
-rw-r--r--libexec/rtld-elf/rtld_lock.c2
-rw-r--r--libexec/rtld-elf/rtld_lock.h2
-rw-r--r--libexec/rtld-elf/rtld_malloc.h2
-rw-r--r--libexec/rtld-elf/rtld_printf.h2
-rw-r--r--libexec/rtld-elf/rtld_tls.h2
-rw-r--r--libexec/rtld-elf/tests/common.c2
-rw-r--r--libexec/rtld-elf/tests/common.h2
-rw-r--r--libexec/rtld-elf/tests/ld_preload_fds.c2
-rw-r--r--libexec/rtld-elf/xmalloc.c2
-rwxr-xr-xlibexec/save-entropy/save-entropy.sh2
-rw-r--r--libexec/talkd/extern.h2
-rw-r--r--libexec/tftpd/tests/functional.c2
-rw-r--r--libexec/tftpd/tftp-file.c2
-rw-r--r--libexec/tftpd/tftp-file.h2
-rw-r--r--libexec/tftpd/tftp-io.c2
-rw-r--r--libexec/tftpd/tftp-io.h2
-rw-r--r--libexec/tftpd/tftp-options.c2
-rw-r--r--libexec/tftpd/tftp-options.h2
-rw-r--r--libexec/tftpd/tftp-transfer.c2
-rw-r--r--libexec/tftpd/tftp-transfer.h2
-rw-r--r--libexec/tftpd/tftp-utils.c2
-rw-r--r--libexec/tftpd/tftp-utils.h2
-rw-r--r--libexec/ulog-helper/ulog-helper.c2
-rw-r--r--sbin/adjkerntz/adjkerntz.c2
-rw-r--r--sbin/adjkerntz/pathnames.h2
-rw-r--r--sbin/bectl/bectl.82
-rw-r--r--sbin/bectl/bectl.c2
-rw-r--r--sbin/bectl/bectl.h2
-rw-r--r--sbin/bectl/bectl_jail.c2
-rw-r--r--sbin/bectl/bectl_list.c2
-rwxr-xr-xsbin/bectl/tests/bectl_test.sh2
-rw-r--r--sbin/camcontrol/fwdownload.c2
-rw-r--r--sbin/camcontrol/modeedit.c2
-rw-r--r--sbin/comcontrol/comcontrol.c2
-rw-r--r--sbin/conscontrol/conscontrol.c2
-rw-r--r--sbin/ddb/ddb.c2
-rw-r--r--sbin/ddb/ddb.h2
-rw-r--r--sbin/ddb/ddb_capture.c2
-rw-r--r--sbin/ddb/ddb_script.c2
-rw-r--r--sbin/devd/devd.cc2
-rw-r--r--sbin/devd/devd.h2
-rw-r--r--sbin/devd/devd.hh2
-rw-r--r--sbin/devd/parse.y2
-rw-r--r--sbin/devd/token.l2
-rw-r--r--sbin/devfs/devfs.c2
-rw-r--r--sbin/devfs/extern.h2
-rw-r--r--sbin/devfs/rule.c2
-rw-r--r--sbin/etherswitchcfg/etherswitchcfg.c2
-rw-r--r--sbin/fdisk/fdisk_mbr_enc.c2
-rw-r--r--sbin/fdisk/fdisk_mbr_enc.h2
-rw-r--r--sbin/fsck_ffs/fsck.h2
-rw-r--r--sbin/fsck_ffs/gjournal.c2
-rw-r--r--sbin/fsck_ffs/suj.c2
-rw-r--r--sbin/fsck_msdosfs/boot.c2
-rw-r--r--sbin/fsck_msdosfs/check.c2
-rw-r--r--sbin/fsck_msdosfs/dir.c2
-rw-r--r--sbin/fsck_msdosfs/dosfs.h2
-rw-r--r--sbin/fsck_msdosfs/ext.h2
-rw-r--r--sbin/fsirand/fsirand.c2
-rw-r--r--sbin/gbde/gbde.c2
-rw-r--r--sbin/geom/core/geom.c2
-rw-r--r--sbin/geom/core/geom.h2
-rw-r--r--sbin/geom/misc/subr.c2
-rw-r--r--sbin/geom/misc/subr.h2
-rw-r--r--sbin/ggate/ggatec/ggatec.c2
-rw-r--r--sbin/ggate/ggated/ggated.c2
-rw-r--r--sbin/ggate/ggatel/ggatel.c2
-rw-r--r--sbin/ggate/shared/ggate.c2
-rw-r--r--sbin/ggate/shared/ggate.h2
-rw-r--r--sbin/gvinum/gvinum.c2
-rw-r--r--sbin/hastctl/hastctl.c2
-rw-r--r--sbin/hastd/activemap.c2
-rw-r--r--sbin/hastd/activemap.h2
-rw-r--r--sbin/hastd/control.c2
-rw-r--r--sbin/hastd/control.h2
-rw-r--r--sbin/hastd/ebuf.c2
-rw-r--r--sbin/hastd/ebuf.h2
-rw-r--r--sbin/hastd/event.c2
-rw-r--r--sbin/hastd/event.h2
-rw-r--r--sbin/hastd/hast.h2
-rw-r--r--sbin/hastd/hast_checksum.c2
-rw-r--r--sbin/hastd/hast_checksum.h2
-rw-r--r--sbin/hastd/hast_compression.c2
-rw-r--r--sbin/hastd/hast_compression.h2
-rw-r--r--sbin/hastd/hast_proto.c2
-rw-r--r--sbin/hastd/hast_proto.h2
-rw-r--r--sbin/hastd/hastd.c2
-rw-r--r--sbin/hastd/hastd.h2
-rw-r--r--sbin/hastd/hooks.c2
-rw-r--r--sbin/hastd/hooks.h2
-rw-r--r--sbin/hastd/lzf.c2
-rw-r--r--sbin/hastd/lzf.h2
-rw-r--r--sbin/hastd/metadata.c2
-rw-r--r--sbin/hastd/metadata.h2
-rw-r--r--sbin/hastd/nv.c2
-rw-r--r--sbin/hastd/nv.h2
-rw-r--r--sbin/hastd/parse.y2
-rw-r--r--sbin/hastd/pjdlog.c2
-rw-r--r--sbin/hastd/pjdlog.h2
-rw-r--r--sbin/hastd/primary.c2
-rw-r--r--sbin/hastd/proto.c2
-rw-r--r--sbin/hastd/proto.h2
-rw-r--r--sbin/hastd/proto_common.c2
-rw-r--r--sbin/hastd/proto_impl.h2
-rw-r--r--sbin/hastd/proto_socketpair.c2
-rw-r--r--sbin/hastd/proto_tcp.c2
-rw-r--r--sbin/hastd/proto_uds.c2
-rw-r--r--sbin/hastd/rangelock.c2
-rw-r--r--sbin/hastd/rangelock.h2
-rw-r--r--sbin/hastd/refcnt.h2
-rw-r--r--sbin/hastd/secondary.c2
-rw-r--r--sbin/hastd/subr.c2
-rw-r--r--sbin/hastd/subr.h2
-rw-r--r--sbin/hastd/synch.h2
-rw-r--r--sbin/hastd/token.l2
-rw-r--r--sbin/ifconfig/af_nd6.c2
-rw-r--r--sbin/ifconfig/carp.c2
-rw-r--r--sbin/ifconfig/iffib.c2
-rw-r--r--sbin/ifconfig/ifgif.c2
-rw-r--r--sbin/ifconfig/ifgre.c2
-rw-r--r--sbin/ifconfig/ifgroup.c2
-rw-r--r--sbin/ifconfig/ifpfsync.c2
-rw-r--r--sbin/ipfw/nat64clat.c2
-rw-r--r--sbin/ipfw/nat64lsn.c2
-rw-r--r--sbin/ipfw/nat64stl.c2
-rw-r--r--sbin/iscontrol/auth_subr.c2
-rw-r--r--sbin/iscontrol/config.c2
-rw-r--r--sbin/iscontrol/fsm.c2
-rw-r--r--sbin/iscontrol/iscontrol.c2
-rw-r--r--sbin/iscontrol/iscontrol.h2
-rw-r--r--sbin/iscontrol/login.c2
-rw-r--r--sbin/iscontrol/misc.c2
-rw-r--r--sbin/iscontrol/pdu.c2
-rw-r--r--sbin/kldconfig/kldconfig.c2
-rw-r--r--sbin/kldload/kldload.c2
-rw-r--r--sbin/kldstat/kldstat.c2
-rw-r--r--sbin/kldunload/kldunload.c2
-rw-r--r--sbin/ldconfig/elfhints.c2
-rw-r--r--sbin/ldconfig/ldconfig.h2
-rw-r--r--sbin/mdconfig/mdconfig.c2
-rw-r--r--sbin/mdmfs/mdmfs.c2
-rw-r--r--sbin/mount/extern.h2
-rw-r--r--sbin/mount_fusefs/mount_fusefs.c2
-rw-r--r--sbin/newfs_msdos/newfs_msdos.c2
-rw-r--r--sbin/nos-tun/nos-tun.c2
-rw-r--r--sbin/nvmecontrol/comnd.c2
-rw-r--r--sbin/nvmecontrol/comnd.h2
-rw-r--r--sbin/nvmecontrol/devlist.c2
-rw-r--r--sbin/nvmecontrol/firmware.c2
-rw-r--r--sbin/nvmecontrol/format.c2
-rw-r--r--sbin/nvmecontrol/identify.c2
-rw-r--r--sbin/nvmecontrol/identify_ext.c2
-rw-r--r--sbin/nvmecontrol/logpage.c2
-rw-r--r--sbin/nvmecontrol/modules/intel/intel.c2
-rw-r--r--sbin/nvmecontrol/nc_util.c2
-rw-r--r--sbin/nvmecontrol/ns.c2
-rw-r--r--sbin/nvmecontrol/nsid.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.c2
-rw-r--r--sbin/nvmecontrol/nvmecontrol.h2
-rw-r--r--sbin/nvmecontrol/nvmecontrol_ext.h2
-rw-r--r--sbin/nvmecontrol/passthru.c2
-rw-r--r--sbin/nvmecontrol/perftest.c2
-rw-r--r--sbin/nvmecontrol/reset.c2
-rw-r--r--sbin/nvmecontrol/resv.c2
-rw-r--r--sbin/nvmecontrol/sanitize.c2
-rw-r--r--sbin/nvmecontrol/selftest.c2
-rwxr-xr-xsbin/nvmecontrol/tests/basic.sh2
-rw-r--r--sbin/pfilctl/pfilctl.c2
-rw-r--r--sbin/ping/main.c2
-rw-r--r--sbin/ping/main.h2
-rw-r--r--sbin/ping/ping.h2
-rw-r--r--sbin/ping/ping6.h2
-rw-r--r--sbin/ping/tests/in_cksum_test.c2
-rw-r--r--sbin/ping/tests/ping_test.sh2
-rw-r--r--sbin/ping/utils.h2
-rw-r--r--sbin/rcorder/rcorder.c2
-rw-r--r--sbin/reboot/nextboot.sh2
-rw-r--r--sbin/route/tests/basic.sh2
-rw-r--r--sbin/route/tests/utils.subr2
-rw-r--r--sbin/spppcontrol/spppcontrol.c2
-rw-r--r--share/dtrace/ipfw.d2
-rwxr-xr-xshare/examples/bhyve/vmrun.sh2
-rwxr-xr-xshare/examples/hast/ucarp.sh2
-rwxr-xr-xshare/examples/hast/ucarp_down.sh2
-rwxr-xr-xshare/examples/hast/ucarp_up.sh2
-rwxr-xr-xshare/examples/ipfw/change_rules.sh2
-rw-r--r--share/examples/kld/khelp/h_example.c2
-rw-r--r--share/examples/kld/random_adaptor/random_adaptor_example.c2
-rw-r--r--share/examples/kld/syscall/module/syscall.c2
-rw-r--r--share/examples/kld/syscall/test/call.c2
-rw-r--r--share/examples/libvgl/demo.c2
-rw-r--r--share/examples/mdoc/POSIX-copyright2
-rw-r--r--share/examples/mdoc/example.12
-rw-r--r--share/examples/mdoc/example.32
-rw-r--r--share/examples/mdoc/example.42
-rw-r--r--share/examples/mdoc/example.92
-rw-r--r--share/examples/scsi_target/scsi_cmds.c2
-rw-r--r--share/examples/scsi_target/scsi_target.c2
-rw-r--r--share/examples/scsi_target/scsi_target.h2
-rw-r--r--share/examples/sound/basic.c2
-rw-r--r--share/examples/sound/midi.c2
-rw-r--r--share/examples/sound/ossinit.h2
-rw-r--r--share/examples/sound/ossmidi.h2
-rw-r--r--share/man/man3lua/intro.3lua2
-rw-r--r--share/man/man4/cp2112.42
-rw-r--r--share/man/man4/efidev.42
-rw-r--r--share/man/man4/ftwd.42
-rw-r--r--share/man/man4/gpiokeys.42
-rw-r--r--share/man/man4/htu21.42
-rw-r--r--share/man/man4/imcsmb.42
-rw-r--r--share/man/man4/itwd.42
-rw-r--r--share/man/man4/jedec_dimm.42
-rw-r--r--share/man/man4/man4.aarch64/rk_i2c.42
-rw-r--r--share/man/man4/man4.arm/aw_sid.42
-rw-r--r--share/man/man4/man4.arm/aw_syscon.42
-rw-r--r--share/man/man4/man4.arm/bcm283x_pwm.42
-rw-r--r--share/man/man4/max44009.42
-rw-r--r--share/man/man4/ng_vlan_rotate.42
-rw-r--r--share/man/man4/pca954x.42
-rw-r--r--share/man/man4/pcf8574.42
-rw-r--r--share/man/man4/pcf8591.42
-rw-r--r--share/man/man4/sume.42
-rw-r--r--share/man/man4/superio.42
-rw-r--r--share/man/man4/tslog.42
-rw-r--r--share/man/man4/vmd.42
-rw-r--r--share/man/man5/fusefs.52
-rw-r--r--share/man/man5/lindebugfs.52
-rw-r--r--share/man/man5/style.mdoc.52
-rw-r--r--share/man/man7/stats.72
-rw-r--r--share/man/man8/beinstall.82
-rw-r--r--share/man/man9/BUS_GET_PROPERTY.92
-rw-r--r--share/man/man9/VOP_BMAP.92
-rw-r--r--share/man/man9/device_get_property.92
-rw-r--r--share/man/man9/efirt.92
-rw-r--r--share/man/man9/ether_gen_addr.92
-rw-r--r--share/man/man9/style.92
-rw-r--r--share/man/man9/style.lua.92
-rw-r--r--share/man/man9/superio.92
-rw-r--r--share/man/man9/vnode_pager_setsize.92
-rw-r--r--share/mk/version_gen.awk2
-rw-r--r--share/syscons/scrnmaps/mkscrfil.c2
-rw-r--r--stand/efi/libefi/efihttp.c2
-rw-r--r--stand/efi/loader/arch/riscv/start.S2
-rw-r--r--stand/libsa/closeall.c2
-rw-r--r--stand/libsa/geli/geli_metadata.c2
-rw-r--r--stand/libsa/geli/gelidev.c2
-rw-r--r--stand/lua/cli.lua2
-rw-r--r--stand/lua/cli.lua.82
-rw-r--r--stand/lua/color.lua2
-rw-r--r--stand/lua/color.lua.82
-rw-r--r--stand/lua/config.lua2
-rw-r--r--stand/lua/config.lua.82
-rw-r--r--stand/lua/core.lua2
-rw-r--r--stand/lua/core.lua.82
-rw-r--r--stand/lua/drawer.lua2
-rw-r--r--stand/lua/drawer.lua.82
-rw-r--r--stand/lua/gfx-beastie.lua2
-rw-r--r--stand/lua/gfx-beastiebw.lua2
-rw-r--r--stand/lua/gfx-fbsdbw.lua2
-rw-r--r--stand/lua/gfx-orb.lua2
-rw-r--r--stand/lua/gfx-orbbw.lua2
-rw-r--r--stand/lua/hook.lua2
-rw-r--r--stand/lua/hook.lua.82
-rw-r--r--stand/lua/loader.lua2
-rw-r--r--stand/lua/menu.lua2
-rw-r--r--stand/lua/menu.lua.82
-rw-r--r--stand/lua/password.lua2
-rw-r--r--stand/lua/password.lua.82
-rw-r--r--stand/lua/screen.lua2
-rw-r--r--stand/lua/screen.lua.82
-rw-r--r--stand/man/loader.efi.82
-rw-r--r--stand/powerpc/ofw/trampolineLE.S2
-rw-r--r--sys/amd64/acpica/acpi_machdep.c2
-rw-r--r--sys/amd64/acpica/acpi_wakeup.c2
-rw-r--r--sys/amd64/amd64/bios.c2
-rw-r--r--sys/amd64/amd64/copyout.c2
-rw-r--r--sys/amd64/amd64/efirt_support.S2
-rw-r--r--sys/amd64/amd64/elf_machdep.c2
-rw-r--r--sys/amd64/amd64/gdb_machdep.c2
-rw-r--r--sys/amd64/amd64/initcpu.c2
-rw-r--r--sys/amd64/amd64/io.c2
-rw-r--r--sys/amd64/amd64/minidump_machdep.c2
-rw-r--r--sys/amd64/amd64/mp_machdep.c2
-rw-r--r--sys/amd64/amd64/prof_machdep.c2
-rw-r--r--sys/amd64/amd64/ptrace_machdep.c2
-rw-r--r--sys/amd64/amd64/uma_machdep.c2
-rw-r--r--sys/amd64/ia32/ia32_misc.c2
-rw-r--r--sys/amd64/ia32/ia32_reg.c2
-rw-r--r--sys/amd64/include/_bus.h2
-rw-r--r--sys/amd64/include/asan.h2
-rw-r--r--sys/amd64/include/atomic.h2
-rw-r--r--sys/amd64/include/bus_dma.h2
-rw-r--r--sys/amd64/include/counter.h2
-rw-r--r--sys/amd64/include/frame.h2
-rw-r--r--sys/amd64/include/gdb_machdep.h2
-rw-r--r--sys/amd64/include/intr_machdep.h2
-rw-r--r--sys/amd64/include/iodev.h2
-rw-r--r--sys/amd64/include/kdb.h2
-rw-r--r--sys/amd64/include/memdev.h2
-rw-r--r--sys/amd64/include/minidump.h2
-rw-r--r--sys/amd64/include/mp_watchdog.h2
-rw-r--r--sys/amd64/include/pc/bios.h2
-rw-r--r--sys/amd64/include/pcpu.h2
-rw-r--r--sys/amd64/include/pcpu_aux.h2
-rw-r--r--sys/amd64/include/pmc_mdep.h2
-rw-r--r--sys/amd64/include/ppireg.h2
-rw-r--r--sys/amd64/include/runq.h2
-rw-r--r--sys/amd64/include/sf_buf.h2
-rw-r--r--sys/amd64/include/timerreg.h2
-rw-r--r--sys/amd64/include/vm.h2
-rw-r--r--sys/amd64/include/vmm.h2
-rw-r--r--sys/amd64/include/vmm_dev.h2
-rw-r--r--sys/amd64/include/vmm_instruction_emul.h2
-rw-r--r--sys/amd64/include/vmm_snapshot.h2
-rw-r--r--sys/amd64/linux/linux.h2
-rw-r--r--sys/amd64/linux/linux_dummy_machdep.c2
-rw-r--r--sys/amd64/linux/linux_locore.asm2
-rw-r--r--sys/amd64/linux/linux_support.s2
-rw-r--r--sys/amd64/linux/linux_vdso_gtod.c2
-rw-r--r--sys/amd64/linux32/linux32_dummy_machdep.c2
-rw-r--r--sys/amd64/linux32/linux32_support.s2
-rw-r--r--sys/amd64/linux32/linux32_vdso_gtod.c2
-rw-r--r--sys/amd64/pci/pci_cfgreg.c2
-rw-r--r--sys/amd64/vmm/amd/amdiommu.c2
-rw-r--r--sys/amd64/vmm/amd/amdv.c2
-rw-r--r--sys/amd64/vmm/amd/amdvi_hw.c2
-rw-r--r--sys/amd64/vmm/amd/amdvi_priv.h2
-rw-r--r--sys/amd64/vmm/amd/ivrs_drv.c2
-rw-r--r--sys/amd64/vmm/amd/npt.c2
-rw-r--r--sys/amd64/vmm/amd/npt.h2
-rw-r--r--sys/amd64/vmm/amd/svm.c2
-rw-r--r--sys/amd64/vmm/amd/svm.h2
-rw-r--r--sys/amd64/vmm/amd/svm_genassym.c2
-rw-r--r--sys/amd64/vmm/amd/svm_msr.c2
-rw-r--r--sys/amd64/vmm/amd/svm_msr.h2
-rw-r--r--sys/amd64/vmm/amd/svm_softc.h2
-rw-r--r--sys/amd64/vmm/amd/svm_support.S2
-rw-r--r--sys/amd64/vmm/amd/vmcb.c2
-rw-r--r--sys/amd64/vmm/amd/vmcb.h2
-rw-r--r--sys/amd64/vmm/intel/ept.c2
-rw-r--r--sys/amd64/vmm/intel/ept.h2
-rw-r--r--sys/amd64/vmm/intel/vmcs.c2
-rw-r--r--sys/amd64/vmm/intel/vmcs.h2
-rw-r--r--sys/amd64/vmm/intel/vmx.c2
-rw-r--r--sys/amd64/vmm/intel/vmx.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_controls.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_cpufunc.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_genassym.c2
-rw-r--r--sys/amd64/vmm/intel/vmx_msr.c2
-rw-r--r--sys/amd64/vmm/intel/vmx_msr.h2
-rw-r--r--sys/amd64/vmm/intel/vmx_support.S2
-rw-r--r--sys/amd64/vmm/intel/vtd.c2
-rw-r--r--sys/amd64/vmm/io/iommu.c2
-rw-r--r--sys/amd64/vmm/io/iommu.h2
-rw-r--r--sys/amd64/vmm/io/ppt.c2
-rw-r--r--sys/amd64/vmm/io/ppt.h2
-rw-r--r--sys/amd64/vmm/io/vatpic.c2
-rw-r--r--sys/amd64/vmm/io/vatpit.h2
-rw-r--r--sys/amd64/vmm/io/vhpet.c2
-rw-r--r--sys/amd64/vmm/io/vhpet.h2
-rw-r--r--sys/amd64/vmm/io/vioapic.c2
-rw-r--r--sys/amd64/vmm/io/vioapic.h2
-rw-r--r--sys/amd64/vmm/io/vlapic.c2
-rw-r--r--sys/amd64/vmm/io/vlapic.h2
-rw-r--r--sys/amd64/vmm/io/vlapic_priv.h2
-rw-r--r--sys/amd64/vmm/io/vpmtmr.c2
-rw-r--r--sys/amd64/vmm/io/vpmtmr.h2
-rw-r--r--sys/amd64/vmm/io/vrtc.c2
-rw-r--r--sys/amd64/vmm/io/vrtc.h2
-rw-r--r--sys/amd64/vmm/vmm.c2
-rw-r--r--sys/amd64/vmm/vmm_dev.c2
-rw-r--r--sys/amd64/vmm/vmm_host.c2
-rw-r--r--sys/amd64/vmm/vmm_host.h2
-rw-r--r--sys/amd64/vmm/vmm_instruction_emul.c2
-rw-r--r--sys/amd64/vmm/vmm_ioport.c2
-rw-r--r--sys/amd64/vmm/vmm_ioport.h2
-rw-r--r--sys/amd64/vmm/vmm_ktr.h2
-rw-r--r--sys/amd64/vmm/vmm_lapic.c2
-rw-r--r--sys/amd64/vmm/vmm_lapic.h2
-rw-r--r--sys/amd64/vmm/vmm_mem.c2
-rw-r--r--sys/amd64/vmm/vmm_mem.h2
-rw-r--r--sys/amd64/vmm/vmm_snapshot.c2
-rw-r--r--sys/amd64/vmm/vmm_stat.c2
-rw-r--r--sys/amd64/vmm/vmm_util.c2
-rw-r--r--sys/amd64/vmm/vmm_util.h2
-rw-r--r--sys/amd64/vmm/x86.c2
-rw-r--r--sys/amd64/vmm/x86.h2
-rw-r--r--sys/arm/allwinner/a10_sramc.c2
-rw-r--r--sys/arm/allwinner/a10_sramc.h2
-rw-r--r--sys/arm/allwinner/a20/a20_cpu_cfg.c2
-rw-r--r--sys/arm/allwinner/a20/a20_cpu_cfg.h2
-rw-r--r--sys/arm/allwinner/aw_dwc3.c2
-rw-r--r--sys/arm/allwinner/aw_gpio.c2
-rw-r--r--sys/arm/allwinner/aw_mmc.c2
-rw-r--r--sys/arm/allwinner/aw_mmc.h2
-rw-r--r--sys/arm/allwinner/aw_pwm.c2
-rw-r--r--sys/arm/allwinner/aw_syscon.c2
-rw-r--r--sys/arm/allwinner/clkng/aw_ccung.c2
-rw-r--r--sys/arm/allwinner/clkng/aw_ccung.h2
-rw-r--r--sys/arm/allwinner/clkng/aw_clk_nmm.c2
-rw-r--r--sys/arm/allwinner/clkng/aw_clk_nmm.h2
-rw-r--r--sys/arm/allwinner/clkng/aw_clk_np.c2
-rw-r--r--sys/arm/allwinner/clkng/aw_clk_np.h2
-rw-r--r--sys/arm/allwinner/clkng/ccu_a10.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_a13.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_a31.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_a64.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_a83t.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_de2.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_h3.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_h6.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_h6_r.c2
-rw-r--r--sys/arm/allwinner/clkng/ccu_sun8i_r.c2
-rw-r--r--sys/arm/allwinner/if_emac.c2
-rw-r--r--sys/arm/allwinner/if_emacreg.h2
-rw-r--r--sys/arm/arm/busdma_machdep.c2
-rw-r--r--sys/arm/arm/dump_machdep.c2
-rw-r--r--sys/arm/arm/elf_machdep.c2
-rw-r--r--sys/arm/arm/gdb_machdep.c2
-rw-r--r--sys/arm/arm/genassym.c2
-rw-r--r--sys/arm/arm/minidump_machdep.c2
-rw-r--r--sys/arm/arm/mp_machdep.c2
-rw-r--r--sys/arm/arm/pl190.c2
-rw-r--r--sys/arm/arm/pmap-v6.c2
-rw-r--r--sys/arm/arm/sc_machdep.c2
-rw-r--r--sys/arm/arm/stdatomic.c2
-rw-r--r--sys/arm/arm/vfp.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bsc.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bscreg.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bscvar.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_clkman.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_clkman.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fb.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fbd.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_gpio.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_intr.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_mbox.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_mbox.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_pwm.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_sdhci.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_sdhost.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spi.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spireg.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spivar.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_systimer.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_vcbus.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_vcbus.h2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_wdog.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_wdog.h2
-rw-r--r--sys/arm/broadcom/bcm2835/raspberrypi_gpio.c2
-rw-r--r--sys/arm/freescale/fsl_ocotp.c2
-rw-r--r--sys/arm/freescale/fsl_ocotpreg.h2
-rw-r--r--sys/arm/freescale/fsl_ocotpvar.h2
-rw-r--r--sys/arm/freescale/imx/imx51_ccm.c2
-rw-r--r--sys/arm/freescale/imx/imx51_ccmreg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_ccmvar.h2
-rw-r--r--sys/arm/freescale/imx/imx51_dpllreg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3.c2
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3_fbd.c2
-rw-r--r--sys/arm/freescale/imx/imx51_ipuv3reg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx51_sdmareg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_ssireg.h2
-rw-r--r--sys/arm/freescale/imx/imx51_tzicreg.h2
-rw-r--r--sys/arm/freescale/imx/imx53_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx6_anatop.c2
-rw-r--r--sys/arm/freescale/imx/imx6_anatopreg.h2
-rw-r--r--sys/arm/freescale/imx/imx6_anatopvar.h2
-rw-r--r--sys/arm/freescale/imx/imx6_ccm.c2
-rw-r--r--sys/arm/freescale/imx/imx6_ccmreg.h2
-rw-r--r--sys/arm/freescale/imx/imx6_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx6_mp.c2
-rw-r--r--sys/arm/freescale/imx/imx6_pl310.c2
-rw-r--r--sys/arm/freescale/imx/imx6_usbphy.c2
-rw-r--r--sys/arm/freescale/imx/imx_gpt.c2
-rw-r--r--sys/arm/freescale/imx/imx_gptreg.h2
-rw-r--r--sys/arm/freescale/imx/imx_machdep.c2
-rw-r--r--sys/arm/freescale/imx/imx_machdep.h2
-rw-r--r--sys/arm/freescale/imx/imx_nop_usbphy.c2
-rw-r--r--sys/arm/freescale/imx/imx_spi.c2
-rw-r--r--sys/arm/freescale/imx/imx_wdog.c2
-rw-r--r--sys/arm/freescale/imx/imx_wdogreg.h2
-rw-r--r--sys/arm/freescale/imx/tzic.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_anadig.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_ccm.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_common.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_dcu4.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_dmamux.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_dmamux.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_edma.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_edma.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_ehci.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_gpio.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_i2c.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_iomuxc.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_iomuxc.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_machdep.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_mscm.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_port.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_port.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_sai.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_src.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_src.h2
-rw-r--r--sys/arm/freescale/vybrid/vf_tcon.c2
-rw-r--r--sys/arm/freescale/vybrid/vf_uart.c2
-rw-r--r--sys/arm/include/_bus.h2
-rw-r--r--sys/arm/include/asmacros.h2
-rw-r--r--sys/arm/include/atags.h2
-rw-r--r--sys/arm/include/clock.h2
-rw-r--r--sys/arm/include/counter.h2
-rw-r--r--sys/arm/include/elf.h2
-rw-r--r--sys/arm/include/fdt.h2
-rw-r--r--sys/arm/include/gdb_machdep.h2
-rw-r--r--sys/arm/include/kdb.h2
-rw-r--r--sys/arm/include/memdev.h2
-rw-r--r--sys/arm/include/metadata.h2
-rw-r--r--sys/arm/include/minidump.h2
-rw-r--r--sys/arm/include/ofw_machdep.h2
-rw-r--r--sys/arm/include/pcpu.h2
-rw-r--r--sys/arm/include/pcpu_aux.h2
-rw-r--r--sys/arm/include/pl310.h2
-rw-r--r--sys/arm/include/pmap.h2
-rw-r--r--sys/arm/include/pmc_mdep.h2
-rw-r--r--sys/arm/include/runq.h2
-rw-r--r--sys/arm/include/sc_machdep.h2
-rw-r--r--sys/arm/include/sf_buf.h2
-rw-r--r--sys/arm/include/tls.h2
-rw-r--r--sys/arm/include/vdso.h2
-rw-r--r--sys/arm/include/vfp.h2
-rw-r--r--sys/arm/include/vm.h2
-rw-r--r--sys/arm/mv/a37x0_gpio.c2
-rw-r--r--sys/arm/mv/a37x0_iic.c2
-rw-r--r--sys/arm/mv/a37x0_iicreg.h2
-rw-r--r--sys/arm/mv/armadaxp/armadaxp.c2
-rw-r--r--sys/arm/mv/armadaxp/armadaxp_mp.c2
-rw-r--r--sys/arm/mv/gpio.c2
-rw-r--r--sys/arm/mv/ic.c2
-rw-r--r--sys/arm/mv/mpic.c2
-rw-r--r--sys/arm/mv/mv_ap806_clock.c2
-rw-r--r--sys/arm/mv/mv_ap806_gicp.c2
-rw-r--r--sys/arm/mv/mv_ap806_sei.c2
-rw-r--r--sys/arm/mv/mv_armv7_machdep.c2
-rw-r--r--sys/arm/mv/mv_cp110_clock.c2
-rw-r--r--sys/arm/mv/mv_cp110_clock.h2
-rw-r--r--sys/arm/mv/mv_cp110_icu.c2
-rw-r--r--sys/arm/mv/mv_cp110_icu_bus.c2
-rw-r--r--sys/arm/mv/mv_localbus.c2
-rw-r--r--sys/arm/mv/mv_thermal.c2
-rw-r--r--sys/arm/mv/mv_ts.c2
-rw-r--r--sys/arm/mv/mvebu_pinctrl.c2
-rw-r--r--sys/arm/mv/mvvar.h2
-rw-r--r--sys/arm/mv/timer.c2
-rw-r--r--sys/arm/rockchip/rk32xx_machdep.c2
-rw-r--r--sys/arm/rockchip/rk32xx_mp.c2
-rw-r--r--sys/arm/rockchip/rk32xx_mp.h2
-rw-r--r--sys/arm/ti/aintc.c2
-rw-r--r--sys/arm/ti/am335x/am335x_dmtimer.c2
-rw-r--r--sys/arm/ti/am335x/am335x_lcd.c2
-rw-r--r--sys/arm/ti/am335x/am335x_lcd.h2
-rw-r--r--sys/arm/ti/am335x/am335x_lcd_syscons.c2
-rw-r--r--sys/arm/ti/am335x/am335x_pmic.c2
-rw-r--r--sys/arm/ti/am335x/am335x_pwm.h2
-rw-r--r--sys/arm/ti/am335x/am335x_reg.h2
-rw-r--r--sys/arm/ti/am335x/am335x_scm.h2
-rw-r--r--sys/arm/ti/am335x/am335x_scm_padconf.c2
-rw-r--r--sys/arm/ti/clk/clock_common.c2
-rw-r--r--sys/arm/ti/clk/clock_common.h2
-rw-r--r--sys/arm/ti/clk/ti_clk_clkctrl.c2
-rw-r--r--sys/arm/ti/clk/ti_clk_clkctrl.h2
-rw-r--r--sys/arm/ti/clk/ti_clk_dpll.c2
-rw-r--r--sys/arm/ti/clk/ti_clk_dpll.h2
-rw-r--r--sys/arm/ti/clk/ti_clkctrl.c2
-rw-r--r--sys/arm/ti/clk/ti_divider_clock.c2
-rw-r--r--sys/arm/ti/clk/ti_dpll_clock.c2
-rw-r--r--sys/arm/ti/clk/ti_gate_clock.c2
-rw-r--r--sys/arm/ti/clk/ti_mux_clock.c2
-rw-r--r--sys/arm/ti/cpsw/if_cpsw.c2
-rw-r--r--sys/arm/ti/cpsw/if_cpswreg.h2
-rw-r--r--sys/arm/ti/cpsw/if_cpswvar.h2
-rw-r--r--sys/arm/ti/omap4/omap4_l2cache.c2
-rw-r--r--sys/arm/ti/omap4/omap4_mp.c2
-rw-r--r--sys/arm/ti/omap4/omap4_reg.h2
-rw-r--r--sys/arm/ti/omap4/omap4_smc.h2
-rw-r--r--sys/arm/ti/ti_cpuid.c2
-rw-r--r--sys/arm/ti/ti_cpuid.h2
-rw-r--r--sys/arm/ti/ti_edma3.h2
-rw-r--r--sys/arm/ti/ti_gpio.c2
-rw-r--r--sys/arm/ti/ti_i2c.c2
-rw-r--r--sys/arm/ti/ti_i2c.h2
-rw-r--r--sys/arm/ti/ti_mbox.c2
-rw-r--r--sys/arm/ti/ti_mbox.h2
-rw-r--r--sys/arm/ti/ti_omap4_cm.c2
-rw-r--r--sys/arm/ti/ti_omap4_cm.h2
-rw-r--r--sys/arm/ti/ti_prcm.c2
-rw-r--r--sys/arm/ti/ti_prcm.h2
-rw-r--r--sys/arm/ti/ti_prm.h2
-rw-r--r--sys/arm/ti/ti_pruss.c2
-rw-r--r--sys/arm/ti/ti_pruss.h2
-rw-r--r--sys/arm/ti/ti_sdhci.c2
-rw-r--r--sys/arm/ti/ti_sdma.c2
-rw-r--r--sys/arm/ti/ti_sdma.h2
-rw-r--r--sys/arm/ti/ti_sdmareg.h2
-rw-r--r--sys/arm/ti/ti_smc.h2
-rw-r--r--sys/arm/ti/ti_sysc.h2
-rw-r--r--sys/arm/ti/twl/twl.c2
-rw-r--r--sys/arm/ti/twl/twl.h2
-rw-r--r--sys/arm/ti/twl/twl_clks.c2
-rw-r--r--sys/arm/ti/twl/twl_clks.h2
-rw-r--r--sys/arm/ti/twl/twl_vreg.c2
-rw-r--r--sys/arm/ti/twl/twl_vreg.h2
-rw-r--r--sys/arm/ti/usb/omap_ehci.c2
-rw-r--r--sys/arm/versatile/pl050.c2
-rw-r--r--sys/arm/versatile/sp804.c2
-rw-r--r--sys/arm/versatile/versatile_clcd.c2
-rw-r--r--sys/arm/versatile/versatile_pci.c2
-rw-r--r--sys/arm/versatile/versatile_sic.c2
-rw-r--r--sys/arm/xilinx/uart_dev_cdnc.c2
-rw-r--r--sys/arm/xilinx/zy7_devcfg.c2
-rw-r--r--sys/arm/xilinx/zy7_ehci.c2
-rw-r--r--sys/arm/xilinx/zy7_gpio.c2
-rw-r--r--sys/arm/xilinx/zy7_l2cache.c2
-rw-r--r--sys/arm/xilinx/zy7_machdep.c2
-rw-r--r--sys/arm/xilinx/zy7_qspi.c2
-rw-r--r--sys/arm/xilinx/zy7_reg.h2
-rw-r--r--sys/arm/xilinx/zy7_slcr.c2
-rw-r--r--sys/arm/xilinx/zy7_slcr.h2
-rw-r--r--sys/arm64/acpica/acpi_iort.c2
-rw-r--r--sys/arm64/arm64/gdb_machdep.c2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_composite.c2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_composite.h2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_gate.c2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_gate.h2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_mux.c2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_mux.h2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c2
-rw-r--r--sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h2
-rw-r--r--sys/arm64/freescale/imx/imx7gpc.c2
-rw-r--r--sys/arm64/freescale/imx/imx8mq_ccm.c2
-rw-r--r--sys/arm64/freescale/imx/imx8mq_ccm.h2
-rw-r--r--sys/arm64/freescale/imx/imx_ccm_clk.h2
-rw-r--r--sys/arm64/include/gdb_machdep.h2
-rw-r--r--sys/arm64/include/pcpu_aux.h2
-rw-r--r--sys/arm64/linux/linux_dummy_machdep.c2
-rw-r--r--sys/arm64/linux/linux_locore.asm2
-rw-r--r--sys/arm64/linux/linux_machdep.c2
-rw-r--r--sys/arm64/linux/linux_support.s2
-rw-r--r--sys/arm64/linux/linux_sysvec.c2
-rw-r--r--sys/arm64/linux/linux_vdso_gtod.c2
-rw-r--r--sys/arm64/nvidia/tegra210/max77620.h2
-rw-r--r--sys/arm64/nvidia/tegra210/max77620_gpio.c2
-rw-r--r--sys/arm64/nvidia/tegra210/max77620_regulators.c2
-rw-r--r--sys/arm64/nvidia/tegra210/max77620_rtc.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_car.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_car.h2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_clk_per.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_clk_pll.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_clk_super.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_coretemp.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_cpufreq.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_pinmux.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_pmc.c2
-rw-r--r--sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c2
-rw-r--r--sys/arm64/qoriq/clk/ls1046a_clkgen.c2
-rw-r--r--sys/arm64/qoriq/clk/ls1088a_clkgen.c2
-rw-r--r--sys/arm64/qoriq/clk/lx2160a_clkgen.c2
-rw-r--r--sys/arm64/qoriq/clk/qoriq_clk_pll.c2
-rw-r--r--sys/arm64/qoriq/clk/qoriq_clk_pll.h2
-rw-r--r--sys/arm64/qoriq/clk/qoriq_clkgen.c2
-rw-r--r--sys/arm64/qoriq/clk/qoriq_clkgen.h2
-rw-r--r--sys/arm64/qoriq/ls1046_gpio.c2
-rw-r--r--sys/arm64/qoriq/qoriq_dw_pci.c2
-rw-r--r--sys/arm64/qoriq/qoriq_therm.c2
-rw-r--r--sys/arm64/qoriq/qoriq_therm_if.m2
-rw-r--r--sys/arm64/rockchip/clk/rk3288_cru.c2
-rw-r--r--sys/arm64/rockchip/clk/rk3328_cru.c2
-rw-r--r--sys/arm64/rockchip/clk/rk3399_cru.c2
-rw-r--r--sys/arm64/rockchip/clk/rk3399_pmucru.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_armclk.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_armclk.h2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_composite.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_composite.h2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_fract.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_fract.h2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_gate.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_gate.h2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_mux.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_mux.h2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_pll.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_clk_pll.h2
-rw-r--r--sys/arm64/rockchip/clk/rk_cru.c2
-rw-r--r--sys/arm64/rockchip/clk/rk_cru.h2
-rw-r--r--sys/arm64/rockchip/if_dwc_rk.c2
-rw-r--r--sys/arm64/rockchip/rk3399_emmcphy.c2
-rw-r--r--sys/arm64/rockchip/rk805.c2
-rw-r--r--sys/arm64/rockchip/rk805reg.h2
-rw-r--r--sys/arm64/rockchip/rk_dwc3.c2
-rw-r--r--sys/arm64/rockchip/rk_gpio.c2
-rw-r--r--sys/arm64/rockchip/rk_grf.c2
-rw-r--r--sys/arm64/rockchip/rk_i2c.c2
-rw-r--r--sys/arm64/rockchip/rk_iodomain.c2
-rw-r--r--sys/arm64/rockchip/rk_pcie.c2
-rw-r--r--sys/arm64/rockchip/rk_pcie_phy.c2
-rw-r--r--sys/arm64/rockchip/rk_pinctrl.c2
-rw-r--r--sys/arm64/rockchip/rk_pmu.c2
-rw-r--r--sys/arm64/rockchip/rk_pwm.c2
-rw-r--r--sys/arm64/rockchip/rk_spi.c2
-rw-r--r--sys/arm64/rockchip/rk_tsadc.c2
-rw-r--r--sys/arm64/rockchip/rk_tsadc_if.m2
-rw-r--r--sys/arm64/rockchip/rk_typec_phy.c2
-rw-r--r--sys/arm64/rockchip/rk_usb2phy.c2
-rw-r--r--sys/arm64/rockchip/rk_usbphy.c2
-rw-r--r--sys/cam/ata/ata_all.c2
-rw-r--r--sys/cam/ata/ata_all.h2
-rw-r--r--sys/cam/ata/ata_da.c2
-rw-r--r--sys/cam/ata/ata_pmp.c2
-rw-r--r--sys/cam/ata/ata_xpt.c2
-rw-r--r--sys/cam/cam.c2
-rw-r--r--sys/cam/cam.h2
-rw-r--r--sys/cam/cam_ccb.h2
-rw-r--r--sys/cam/cam_compat.c2
-rw-r--r--sys/cam/cam_compat.h2
-rw-r--r--sys/cam/cam_debug.h2
-rw-r--r--sys/cam/cam_iosched.c2
-rw-r--r--sys/cam/cam_iosched.h2
-rw-r--r--sys/cam/cam_periph.c2
-rw-r--r--sys/cam/cam_periph.h2
-rw-r--r--sys/cam/cam_queue.c2
-rw-r--r--sys/cam/cam_queue.h2
-rw-r--r--sys/cam/cam_sim.c2
-rw-r--r--sys/cam/cam_sim.h2
-rw-r--r--sys/cam/cam_xpt.c2
-rw-r--r--sys/cam/cam_xpt.h2
-rw-r--r--sys/cam/cam_xpt_internal.h2
-rw-r--r--sys/cam/cam_xpt_periph.h2
-rw-r--r--sys/cam/cam_xpt_sim.h2
-rw-r--r--sys/cam/ctl/ctl.c2
-rw-r--r--sys/cam/ctl/ctl.h2
-rw-r--r--sys/cam/ctl/ctl_backend.c2
-rw-r--r--sys/cam/ctl/ctl_backend.h2
-rw-r--r--sys/cam/ctl/ctl_backend_block.c2
-rw-r--r--sys/cam/ctl/ctl_backend_ramdisk.c2
-rw-r--r--sys/cam/ctl/ctl_cmd_table.c2
-rw-r--r--sys/cam/ctl/ctl_debug.h2
-rw-r--r--sys/cam/ctl/ctl_error.c2
-rw-r--r--sys/cam/ctl/ctl_error.h2
-rw-r--r--sys/cam/ctl/ctl_frontend.c2
-rw-r--r--sys/cam/ctl/ctl_frontend.h2
-rw-r--r--sys/cam/ctl/ctl_frontend_cam_sim.c2
-rw-r--r--sys/cam/ctl/ctl_frontend_ioctl.c2
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c2
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.h2
-rw-r--r--sys/cam/ctl/ctl_ha.c2
-rw-r--r--sys/cam/ctl/ctl_ha.h2
-rw-r--r--sys/cam/ctl/ctl_io.h2
-rw-r--r--sys/cam/ctl/ctl_ioctl.h2
-rw-r--r--sys/cam/ctl/ctl_private.h2
-rw-r--r--sys/cam/ctl/ctl_scsi_all.c2
-rw-r--r--sys/cam/ctl/ctl_scsi_all.h2
-rw-r--r--sys/cam/ctl/ctl_ser_table.c2
-rw-r--r--sys/cam/ctl/ctl_tpc.c2
-rw-r--r--sys/cam/ctl/ctl_tpc.h2
-rw-r--r--sys/cam/ctl/ctl_tpc_local.c2
-rw-r--r--sys/cam/ctl/ctl_util.c2
-rw-r--r--sys/cam/ctl/ctl_util.h2
-rw-r--r--sys/cam/ctl/scsi_ctl.c2
-rw-r--r--sys/cam/mmc/mmc.h2
-rw-r--r--sys/cam/mmc/mmc_all.h2
-rw-r--r--sys/cam/mmc/mmc_da.c2
-rw-r--r--sys/cam/mmc/mmc_sim_if.m2
-rw-r--r--sys/cam/mmc/mmc_xpt.c2
-rw-r--r--sys/cam/nvme/nvme_all.c2
-rw-r--r--sys/cam/nvme/nvme_all.h2
-rw-r--r--sys/cam/nvme/nvme_da.c2
-rw-r--r--sys/cam/nvme/nvme_xpt.c2
-rw-r--r--sys/cam/scsi/scsi_all.c2
-rw-r--r--sys/cam/scsi/scsi_cd.c2
-rw-r--r--sys/cam/scsi/scsi_cd.h2
-rw-r--r--sys/cam/scsi/scsi_ch.c2
-rw-r--r--sys/cam/scsi/scsi_da.c2
-rw-r--r--sys/cam/scsi/scsi_enc.c2
-rw-r--r--sys/cam/scsi/scsi_enc.h2
-rw-r--r--sys/cam/scsi/scsi_enc_internal.h2
-rw-r--r--sys/cam/scsi/scsi_enc_safte.c2
-rw-r--r--sys/cam/scsi/scsi_enc_ses.c2
-rw-r--r--sys/cam/scsi/scsi_pass.c2
-rw-r--r--sys/cam/scsi/scsi_pass.h2
-rw-r--r--sys/cam/scsi/scsi_pt.c2
-rw-r--r--sys/cam/scsi/scsi_pt.h2
-rw-r--r--sys/cam/scsi/scsi_sa.c2
-rw-r--r--sys/cam/scsi/scsi_sa.h2
-rw-r--r--sys/cam/scsi/scsi_ses.h2
-rw-r--r--sys/cam/scsi/scsi_sg.c2
-rw-r--r--sys/cam/scsi/scsi_targ_bh.c2
-rw-r--r--sys/cam/scsi/scsi_target.c2
-rw-r--r--sys/cam/scsi/scsi_targetio.h2
-rw-r--r--sys/cam/scsi/scsi_xpt.c2
-rw-r--r--sys/cam/scsi/smp_all.c2
-rw-r--r--sys/cam/scsi/smp_all.h2
-rw-r--r--sys/compat/freebsd32/freebsd32.h2
-rw-r--r--sys/compat/freebsd32/freebsd32_capability.c2
-rw-r--r--sys/compat/freebsd32/freebsd32_ipc.h2
-rw-r--r--sys/compat/freebsd32/freebsd32_misc.c2
-rw-r--r--sys/compat/freebsd32/freebsd32_misc.h2
-rw-r--r--sys/compat/freebsd32/freebsd32_signal.h2
-rw-r--r--sys/compat/ia32/ia32_sysvec.c2
-rw-r--r--sys/compat/lindebugfs/lindebugfs.c2
-rw-r--r--sys/compat/linsysfs/linsysfs.c2
-rw-r--r--sys/compat/linux/linux_dtrace.h2
-rw-r--r--sys/compat/linux/linux_dummy.c2
-rw-r--r--sys/compat/linux/linux_elf.h2
-rw-r--r--sys/compat/linux/linux_elf32.c2
-rw-r--r--sys/compat/linux/linux_elf64.c2
-rw-r--r--sys/compat/linux/linux_emul.c2
-rw-r--r--sys/compat/linux/linux_emul.h2
-rw-r--r--sys/compat/linux/linux_errno.h2
-rw-r--r--sys/compat/linux/linux_errno.inc2
-rw-r--r--sys/compat/linux/linux_event.c2
-rw-r--r--sys/compat/linux/linux_file.c2
-rw-r--r--sys/compat/linux/linux_file.h2
-rw-r--r--sys/compat/linux/linux_fork.c2
-rw-r--r--sys/compat/linux/linux_futex.c2
-rw-r--r--sys/compat/linux/linux_ioctl.c2
-rw-r--r--sys/compat/linux/linux_ioctl.h2
-rw-r--r--sys/compat/linux/linux_ipc.c2
-rw-r--r--sys/compat/linux/linux_ipc.h2
-rw-r--r--sys/compat/linux/linux_mib.c2
-rw-r--r--sys/compat/linux/linux_mib.h2
-rw-r--r--sys/compat/linux/linux_misc.h2
-rw-r--r--sys/compat/linux/linux_netlink.c2
-rw-r--r--sys/compat/linux/linux_ptrace.c2
-rw-r--r--sys/compat/linux/linux_signal.h2
-rw-r--r--sys/compat/linux/linux_socket.c2
-rw-r--r--sys/compat/linux/linux_stats.c2
-rw-r--r--sys/compat/linux/linux_sysctl.c2
-rw-r--r--sys/compat/linux/linux_uid16.c2
-rw-r--r--sys/compat/linux/linux_vdso_gtod.inc2
-rw-r--r--sys/compat/linuxkpi/common/include/acpi/acpi.h2
-rw-r--r--sys/compat/linuxkpi/common/include/acpi/acpi_bus.h2
-rw-r--r--sys/compat/linuxkpi/common/include/acpi/video.h2
-rw-r--r--sys/compat/linuxkpi/common/include/asm/barrier.h2
-rw-r--r--sys/compat/linuxkpi/common/include/asm/fpu/api.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/acpi.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/anon_inodes.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/capability.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/debugfs.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/eventpoll.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/highmem.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/interval_tree.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/interval_tree_generic.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/seq_file.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/seqlock.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/sort.h2
-rw-r--r--sys/compat/linuxkpi/common/include/linux/stdarg.h2
-rw-r--r--sys/compat/linuxkpi/common/include/stdarg.h2
-rw-r--r--sys/compat/linuxkpi/common/src/linux_acpi.c2
-rw-r--r--sys/compat/linuxkpi/common/src/linux_fpu.c2
-rw-r--r--sys/compat/linuxkpi/common/src/linux_seq_file.c2
-rw-r--r--sys/compat/linuxkpi/common/src/linux_simple_attr.c2
-rw-r--r--sys/compat/linuxkpi/common/src/lkpi_iic_if.m2
-rw-r--r--sys/conf/vdso_amd64.ldscript2
-rw-r--r--sys/conf/vdso_amd64_ia32.ldscript2
-rw-r--r--sys/contrib/dpdk_rte_lpm/dpdk_lpm.c2
-rw-r--r--sys/contrib/dpdk_rte_lpm/dpdk_lpm6.c2
-rw-r--r--sys/contrib/dpdk_rte_lpm/dpdk_lpm6.h2
-rw-r--r--sys/contrib/libnv/bsd_nvpair.c2
-rw-r--r--sys/contrib/libnv/cnvlist.c2
-rw-r--r--sys/contrib/libnv/dnvlist.c2
-rw-r--r--sys/contrib/libnv/nv_impl.h2
-rw-r--r--sys/contrib/libnv/nvlist.c2
-rw-r--r--sys/contrib/libnv/nvlist_impl.h2
-rw-r--r--sys/contrib/libnv/nvpair_impl.h2
-rw-r--r--sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompat.h2
-rw-r--r--sys/contrib/openzfs/include/os/freebsd/spl/sys/spl_condvar.h2
-rw-r--r--sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/off/dosmode_readonly_write.c2
-rw-r--r--sys/crypto/ccp/ccp.c2
-rw-r--r--sys/crypto/ccp/ccp.h2
-rw-r--r--sys/crypto/ccp/ccp_hardware.c2
-rw-r--r--sys/crypto/ccp/ccp_hardware.h2
-rw-r--r--sys/crypto/ccp/ccp_lsb.c2
-rw-r--r--sys/crypto/ccp/ccp_lsb.h2
-rw-r--r--sys/crypto/chacha20_poly1305.c2
-rw-r--r--sys/crypto/chacha20_poly1305.h2
-rw-r--r--sys/crypto/curve25519.c2
-rw-r--r--sys/crypto/curve25519.h2
-rw-r--r--sys/crypto/openssl/ossl.c2
-rw-r--r--sys/crypto/openssl/ossl_aarch64.c2
-rw-r--r--sys/crypto/openssl/ossl_chacha20.c2
-rw-r--r--sys/crypto/openssl/ossl_x86.c2
-rw-r--r--sys/ddb/db_capture.c2
-rw-r--r--sys/ddb/db_script.c2
-rw-r--r--sys/ddb/db_textdump.c2
-rw-r--r--sys/ddb/db_thread.c2
-rw-r--r--sys/dev/aac/aac.c2
-rw-r--r--sys/dev/aac/aac_cam.c2
-rw-r--r--sys/dev/aac/aac_debug.c2
-rw-r--r--sys/dev/aac/aac_disk.c2
-rw-r--r--sys/dev/aac/aac_linux.c2
-rw-r--r--sys/dev/aac/aac_pci.c2
-rw-r--r--sys/dev/aac/aac_tables.h2
-rw-r--r--sys/dev/aac/aacreg.h2
-rw-r--r--sys/dev/aac/aacvar.h2
-rw-r--r--sys/dev/aacraid/aacraid.c2
-rw-r--r--sys/dev/aacraid/aacraid_cam.c2
-rw-r--r--sys/dev/aacraid/aacraid_debug.c2
-rw-r--r--sys/dev/aacraid/aacraid_debug.h2
-rw-r--r--sys/dev/aacraid/aacraid_endian.c2
-rw-r--r--sys/dev/aacraid/aacraid_endian.h2
-rw-r--r--sys/dev/aacraid/aacraid_linux.c2
-rw-r--r--sys/dev/aacraid/aacraid_pci.c2
-rw-r--r--sys/dev/aacraid/aacraid_reg.h2
-rw-r--r--sys/dev/aacraid/aacraid_var.h2
-rw-r--r--sys/dev/acpica/acpi_apei.c2
-rw-r--r--sys/dev/acpica/acpi_pxm.c2
-rw-r--r--sys/dev/adb/adb.h2
-rw-r--r--sys/dev/adb/adb_bus.c2
-rw-r--r--sys/dev/adb/adb_kbd.c2
-rw-r--r--sys/dev/adb/adb_mouse.c2
-rw-r--r--sys/dev/adb/adbvar.h2
-rw-r--r--sys/dev/ae/if_ae.c2
-rw-r--r--sys/dev/ae/if_aereg.h2
-rw-r--r--sys/dev/ae/if_aevar.h2
-rw-r--r--sys/dev/age/if_age.c2
-rw-r--r--sys/dev/age/if_agereg.h2
-rw-r--r--sys/dev/age/if_agevar.h2
-rw-r--r--sys/dev/agp/agp.c2
-rw-r--r--sys/dev/agp/agp_ali.c2
-rw-r--r--sys/dev/agp/agp_amd.c2
-rw-r--r--sys/dev/agp/agp_amd64.c2
-rw-r--r--sys/dev/agp/agp_apple.c2
-rw-r--r--sys/dev/agp/agp_ati.c2
-rw-r--r--sys/dev/agp/agp_i810.c2
-rw-r--r--sys/dev/agp/agp_i810.h2
-rw-r--r--sys/dev/agp/agp_intel.c2
-rw-r--r--sys/dev/agp/agp_nvidia.c2
-rw-r--r--sys/dev/agp/agp_sis.c2
-rw-r--r--sys/dev/agp/agp_via.c2
-rw-r--r--sys/dev/agp/agppriv.h2
-rw-r--r--sys/dev/agp/agpreg.h2
-rw-r--r--sys/dev/agp/agpvar.h2
-rw-r--r--sys/dev/ahci/ahci.c2
-rw-r--r--sys/dev/ahci/ahci.h2
-rw-r--r--sys/dev/ahci/ahci_fsl_fdt.c2
-rw-r--r--sys/dev/ahci/ahciem.c2
-rw-r--r--sys/dev/alc/if_alc.c2
-rw-r--r--sys/dev/alc/if_alcreg.h2
-rw-r--r--sys/dev/alc/if_alcvar.h2
-rw-r--r--sys/dev/ale/if_ale.c2
-rw-r--r--sys/dev/ale/if_alereg.h2
-rw-r--r--sys/dev/ale/if_alevar.h2
-rw-r--r--sys/dev/altera/atse/if_atse.c2
-rw-r--r--sys/dev/altera/atse/if_atse_fdt.c2
-rw-r--r--sys/dev/altera/atse/if_atse_nexus.c2
-rw-r--r--sys/dev/altera/atse/if_atsereg.h2
-rw-r--r--sys/dev/altera/avgen/altera_avgen.c2
-rw-r--r--sys/dev/altera/avgen/altera_avgen.h2
-rw-r--r--sys/dev/altera/avgen/altera_avgen_fdt.c2
-rw-r--r--sys/dev/altera/avgen/altera_avgen_nexus.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart.h2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c2
-rw-r--r--sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard.h2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_disk.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_fdt.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_io.c2
-rw-r--r--sys/dev/altera/sdcard/altera_sdcard_nexus.c2
-rw-r--r--sys/dev/altera/softdma/a_api.h2
-rw-r--r--sys/dev/amdgpio/amdgpio.c2
-rw-r--r--sys/dev/amdgpio/amdgpio.h2
-rw-r--r--sys/dev/amdsbwd/amdsbwd.c2
-rw-r--r--sys/dev/amdtemp/amdtemp.c2
-rw-r--r--sys/dev/amr/amr.c2
-rw-r--r--sys/dev/amr/amr_cam.c2
-rw-r--r--sys/dev/amr/amr_disk.c2
-rw-r--r--sys/dev/amr/amr_linux.c2
-rw-r--r--sys/dev/amr/amr_tables.h2
-rw-r--r--sys/dev/amr/amrio.h2
-rw-r--r--sys/dev/amr/amrreg.h2
-rw-r--r--sys/dev/amr/amrvar.h2
-rw-r--r--sys/dev/asmc/asmc.c2
-rw-r--r--sys/dev/asmc/asmcvar.h2
-rw-r--r--sys/dev/ata/ata-all.c2
-rw-r--r--sys/dev/ata/ata-all.h2
-rw-r--r--sys/dev/ata/ata-dma.c2
-rw-r--r--sys/dev/ata/ata-isa.c2
-rw-r--r--sys/dev/ata/ata-lowlevel.c2
-rw-r--r--sys/dev/ata/ata-pci.c2
-rw-r--r--sys/dev/ata/ata-pci.h2
-rw-r--r--sys/dev/ata/ata-sata.c2
-rw-r--r--sys/dev/ata/chipsets/ata-acard.c2
-rw-r--r--sys/dev/ata/chipsets/ata-acerlabs.c2
-rw-r--r--sys/dev/ata/chipsets/ata-amd.c2
-rw-r--r--sys/dev/ata/chipsets/ata-ati.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cenatek.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cypress.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cyrix.c2
-rw-r--r--sys/dev/ata/chipsets/ata-fsl.c2
-rw-r--r--sys/dev/ata/chipsets/ata-highpoint.c2
-rw-r--r--sys/dev/ata/chipsets/ata-intel.c2
-rw-r--r--sys/dev/ata/chipsets/ata-ite.c2
-rw-r--r--sys/dev/ata/chipsets/ata-jmicron.c2
-rw-r--r--sys/dev/ata/chipsets/ata-marvell.c2
-rw-r--r--sys/dev/ata/chipsets/ata-micron.c2
-rw-r--r--sys/dev/ata/chipsets/ata-national.c2
-rw-r--r--sys/dev/ata/chipsets/ata-netcell.c2
-rw-r--r--sys/dev/ata/chipsets/ata-nvidia.c2
-rw-r--r--sys/dev/ata/chipsets/ata-promise.c2
-rw-r--r--sys/dev/ata/chipsets/ata-serverworks.c2
-rw-r--r--sys/dev/ata/chipsets/ata-siliconimage.c2
-rw-r--r--sys/dev/ata/chipsets/ata-sis.c2
-rw-r--r--sys/dev/ata/chipsets/ata-via.c2
-rw-r--r--sys/dev/ath/ah_osdep.c2
-rw-r--r--sys/dev/ath/ah_osdep.h2
-rw-r--r--sys/dev/ath/ath_dfs/null/dfs_null.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9002phy.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9280_olc.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9280_olc.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_cal.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_cal.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_phy.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285_phy.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9285phy.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9287_cal.c2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9287_cal.h2
-rw-r--r--sys/dev/ath/ath_hal/ar9002/ar9287_olc.c2
-rw-r--r--sys/dev/ath/ath_rate/onoe/onoe.c2
-rw-r--r--sys/dev/ath/ath_rate/onoe/onoe.h2
-rw-r--r--sys/dev/ath/if_ath.c2
-rw-r--r--sys/dev/ath/if_ath_ahb.c2
-rw-r--r--sys/dev/ath/if_ath_alq.c2
-rw-r--r--sys/dev/ath/if_ath_alq.h2
-rw-r--r--sys/dev/ath/if_ath_beacon.c2
-rw-r--r--sys/dev/ath/if_ath_beacon.h2
-rw-r--r--sys/dev/ath/if_ath_btcoex.c2
-rw-r--r--sys/dev/ath/if_ath_btcoex.h2
-rw-r--r--sys/dev/ath/if_ath_debug.c2
-rw-r--r--sys/dev/ath/if_ath_debug.h2
-rw-r--r--sys/dev/ath/if_ath_keycache.c2
-rw-r--r--sys/dev/ath/if_ath_keycache.h2
-rw-r--r--sys/dev/ath/if_ath_led.c2
-rw-r--r--sys/dev/ath/if_ath_led.h2
-rw-r--r--sys/dev/ath/if_ath_lna_div.c2
-rw-r--r--sys/dev/ath/if_ath_lna_div.h2
-rw-r--r--sys/dev/ath/if_ath_misc.h2
-rw-r--r--sys/dev/ath/if_ath_pci.c2
-rw-r--r--sys/dev/ath/if_ath_rx.c2
-rw-r--r--sys/dev/ath/if_ath_rx.h2
-rw-r--r--sys/dev/ath/if_ath_rx_edma.c2
-rw-r--r--sys/dev/ath/if_ath_rx_edma.h2
-rw-r--r--sys/dev/ath/if_ath_spectral.c2
-rw-r--r--sys/dev/ath/if_ath_spectral.h2
-rw-r--r--sys/dev/ath/if_ath_sysctl.c2
-rw-r--r--sys/dev/ath/if_ath_sysctl.h2
-rw-r--r--sys/dev/ath/if_ath_tdma.c2
-rw-r--r--sys/dev/ath/if_ath_tdma.h2
-rw-r--r--sys/dev/ath/if_ath_tsf.h2
-rw-r--r--sys/dev/ath/if_ath_tx.c2
-rw-r--r--sys/dev/ath/if_ath_tx.h2
-rw-r--r--sys/dev/ath/if_ath_tx_edma.c2
-rw-r--r--sys/dev/ath/if_ath_tx_edma.h2
-rw-r--r--sys/dev/ath/if_ath_tx_ht.c2
-rw-r--r--sys/dev/ath/if_ath_tx_ht.h2
-rw-r--r--sys/dev/ath/if_athdfs.h2
-rw-r--r--sys/dev/ath/if_athioctl.h2
-rw-r--r--sys/dev/ath/if_athrate.h2
-rw-r--r--sys/dev/ath/if_athvar.h2
-rw-r--r--sys/dev/atkbdc/atkbd.c2
-rw-r--r--sys/dev/atkbdc/atkbd_atkbdc.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_isa.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.h2
-rw-r--r--sys/dev/atkbdc/atkbdreg.h2
-rw-r--r--sys/dev/axgbe/if_axgbe.c2
-rw-r--r--sys/dev/axgbe/if_axgbe_pci.c2
-rw-r--r--sys/dev/axgbe/xgbe-sysctl.c2
-rw-r--r--sys/dev/axgbe/xgbe-txrx.c2
-rw-r--r--sys/dev/axgbe/xgbe_osdep.c2
-rw-r--r--sys/dev/axgbe/xgbe_osdep.h2
-rw-r--r--sys/dev/backlight/backlight.c2
-rw-r--r--sys/dev/backlight/backlight.h2
-rw-r--r--sys/dev/backlight/backlight_if.m2
-rw-r--r--sys/dev/bfe/if_bfe.c2
-rw-r--r--sys/dev/bfe/if_bfereg.h2
-rw-r--r--sys/dev/bhnd/bcma/bcma.c2
-rw-r--r--sys/dev/bhnd/bcma/bcma.h2
-rw-r--r--sys/dev/bhnd/bcma/bcma_bhndb.c2
-rw-r--r--sys/dev/bhnd/bcma/bcma_erom.c2
-rw-r--r--sys/dev/bhnd/bcma/bcma_eromvar.h2
-rw-r--r--sys/dev/bhnd/bcma/bcma_subr.c2
-rw-r--r--sys/dev/bhnd/bcma/bcmavar.h2
-rw-r--r--sys/dev/bhnd/bhnd.c2
-rw-r--r--sys/dev/bhnd/bhnd.h2
-rw-r--r--sys/dev/bhnd/bhnd_debug.h2
-rw-r--r--sys/dev/bhnd/bhnd_erom.c2
-rw-r--r--sys/dev/bhnd/bhnd_erom.h2
-rw-r--r--sys/dev/bhnd/bhnd_erom_types.h2
-rw-r--r--sys/dev/bhnd/bhnd_eromvar.h2
-rw-r--r--sys/dev/bhnd/bhnd_match.h2
-rw-r--r--sys/dev/bhnd/bhnd_private.h2
-rw-r--r--sys/dev/bhnd/bhnd_subr.c2
-rw-r--r--sys/dev/bhnd/bhnd_types.h2
-rw-r--r--sys/dev/bhnd/bhndvar.h2
-rw-r--r--sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc.h2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_cfi.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_gpio.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_gpiovar.h2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_private.h2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_slicer.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_slicer.h2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_spi.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_spi.h2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipc_subr.c2
-rw-r--r--sys/dev/bhnd/cores/chipc/chipcvar.h2
-rw-r--r--sys/dev/bhnd/cores/pci/bhnd_pci.c2
-rw-r--r--sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c2
-rw-r--r--sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h2
-rw-r--r--sys/dev/bhnd/cores/pci/bhnd_pcib.c2
-rw-r--r--sys/dev/bhnd/cores/pci/bhnd_pcibvar.h2
-rw-r--r--sys/dev/bhnd/cores/pci/bhnd_pcivar.h2
-rw-r--r--sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c2
-rw-r--r--sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c2
-rw-r--r--sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h2
-rw-r--r--sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h2
-rw-r--r--sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c2
-rw-r--r--sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h2
-rw-r--r--sys/dev/bhnd/cores/pmu/bhnd_pmu.c2
-rw-r--r--sys/dev/bhnd/cores/pmu/bhnd_pmu.h2
-rw-r--r--sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c2
-rw-r--r--sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h2
-rw-r--r--sys/dev/bhnd/cores/pmu/bhnd_pmureg.h2
-rw-r--r--sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h2
-rw-r--r--sys/dev/bhnd/cores/usb/bhnd_usb.c2
-rw-r--r--sys/dev/bhnd/cores/usb/bhnd_usbvar.h2
-rw-r--r--sys/dev/bhnd/siba/siba_eromvar.h2
-rw-r--r--sys/dev/bwi/if_bwi_pci.c2
-rw-r--r--sys/dev/bwn/if_bwn.c2
-rw-r--r--sys/dev/bwn/if_bwn_pci.c2
-rw-r--r--sys/dev/bwn/if_bwn_pcivar.h2
-rw-r--r--sys/dev/bwn/if_bwnreg.h2
-rw-r--r--sys/dev/bwn/if_bwnvar.h2
-rw-r--r--sys/dev/cadence/if_cgem.c2
-rw-r--r--sys/dev/cadence/if_cgem_hw.h2
-rw-r--r--sys/dev/cardbus/cardbus.c2
-rw-r--r--sys/dev/cardbus/cardbus_cis.c2
-rw-r--r--sys/dev/cardbus/cardbus_cis.h2
-rw-r--r--sys/dev/cardbus/cardbus_device.c2
-rw-r--r--sys/dev/cardbus/cardbusreg.h2
-rw-r--r--sys/dev/cardbus/cardbusvar.h2
-rw-r--r--sys/dev/cas/if_cas.c2
-rw-r--r--sys/dev/cas/if_casreg.h2
-rw-r--r--sys/dev/cas/if_casvar.h2
-rw-r--r--sys/dev/cesa/cesa.c2
-rw-r--r--sys/dev/cesa/cesa.h2
-rw-r--r--sys/dev/cfe/cfe_console.c2
-rw-r--r--sys/dev/cfe/cfe_env.c2
-rw-r--r--sys/dev/cfe/cfe_resource.c2
-rw-r--r--sys/dev/cfi/cfi_bus_nexus.c2
-rw-r--r--sys/dev/cfi/cfi_disk.c2
-rw-r--r--sys/dev/ciss/ciss.c2
-rw-r--r--sys/dev/ciss/cissio.h2
-rw-r--r--sys/dev/ciss/cissreg.h2
-rw-r--r--sys/dev/ciss/cissvar.h2
-rw-r--r--sys/dev/coretemp/coretemp.c2
-rw-r--r--sys/dev/cpuctl/cpuctl.c2
-rw-r--r--sys/dev/cpufreq/ichss.c2
-rw-r--r--sys/dev/cxgb/bin2h.pl2
-rw-r--r--sys/dev/cxgb/common/cxgb_ael1002.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_aq100x.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_common.h2
-rw-r--r--sys/dev/cxgb/common/cxgb_firmware_exports.h2
-rw-r--r--sys/dev/cxgb/common/cxgb_mc5.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_mv88e1xxx.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_regs.h2
-rw-r--r--sys/dev/cxgb/common/cxgb_sge_defs.h2
-rw-r--r--sys/dev/cxgb/common/cxgb_t3_cpl.h2
-rw-r--r--sys/dev/cxgb/common/cxgb_t3_hw.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_tcb.h2
-rw-r--r--sys/dev/cxgb/common/cxgb_tn1010.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_vsc7323.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_vsc8211.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_xgmac.c2
-rw-r--r--sys/dev/cxgb/cxgb_adapter.h2
-rw-r--r--sys/dev/cxgb/cxgb_ioctl.h2
-rw-r--r--sys/dev/cxgb/cxgb_main.c2
-rw-r--r--sys/dev/cxgb/cxgb_offload.h2
-rw-r--r--sys/dev/cxgb/cxgb_osdep.h2
-rw-r--r--sys/dev/cxgb/cxgb_sge.c2
-rw-r--r--sys/dev/cxgb/cxgb_t3fw.h2
-rw-r--r--sys/dev/cxgb/sys/mvec.h2
-rw-r--r--sys/dev/cxgb/sys/uipc_mvec.c2
-rw-r--r--sys/dev/cxgb/t3b_protocol_sram.h2
-rw-r--r--sys/dev/cxgb/t3b_tp_eeprom.h2
-rw-r--r--sys/dev/cxgb/t3c_protocol_sram.h2
-rw-r--r--sys/dev/cxgb/t3c_tp_eeprom.h2
-rw-r--r--sys/dev/cxgbe/adapter.h2
-rw-r--r--sys/dev/cxgbe/common/common.h2
-rw-r--r--sys/dev/cxgbe/common/t4_hw.c2
-rw-r--r--sys/dev/cxgbe/common/t4_hw.h2
-rw-r--r--sys/dev/cxgbe/common/t4_msg.h2
-rw-r--r--sys/dev/cxgbe/common/t4_regs.h2
-rw-r--r--sys/dev/cxgbe/common/t4_regs_values.h2
-rw-r--r--sys/dev/cxgbe/common/t4_tcb.h2
-rw-r--r--sys/dev/cxgbe/crypto/t6_kern_tls.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/cm.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/cq.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/device.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/ev.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/id_table.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/mem.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/provider.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/qp.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/resource.c2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/t4.h2
-rw-r--r--sys/dev/cxgbe/iw_cxgbe/user.h2
-rw-r--r--sys/dev/cxgbe/offload.h2
-rw-r--r--sys/dev/cxgbe/osdep.h2
-rw-r--r--sys/dev/cxgbe/t4_clip.c2
-rw-r--r--sys/dev/cxgbe/t4_clip.h2
-rw-r--r--sys/dev/cxgbe/t4_filter.c2
-rw-r--r--sys/dev/cxgbe/t4_ioctl.h2
-rw-r--r--sys/dev/cxgbe/t4_l2t.c2
-rw-r--r--sys/dev/cxgbe/t4_l2t.h2
-rw-r--r--sys/dev/cxgbe/t4_main.c2
-rw-r--r--sys/dev/cxgbe/t4_sge.c2
-rw-r--r--sys/dev/cxgbe/t4_smt.c2
-rw-r--r--sys/dev/cxgbe/t4_smt.h2
-rw-r--r--sys/dev/cxgbe/t4_tracer.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_connect.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_cpl_io.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_ddp.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_listen.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tls.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tls.h2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom.h2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom_l2t.c2
-rw-r--r--sys/dev/cxgbe/tom/t4_tom_l2t.h2
-rw-r--r--sys/dev/drm2/drm_gem.c2
-rw-r--r--sys/dev/drm2/drm_gem_names.c2
-rw-r--r--sys/dev/drm2/drm_gem_names.h2
-rw-r--r--sys/dev/drm2/drm_linux_list_sort.c2
-rw-r--r--sys/dev/dwwdt/dwwdt.c2
-rw-r--r--sys/dev/esp/esp_pci.c2
-rw-r--r--sys/dev/esp/ncr53c9x.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_7240.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_7240.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8216.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8216.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8226.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8226.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8316.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8316.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8327.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_8327.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_9340.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_9340.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_phy.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_phy.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_reg.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_reg.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_vlans.c2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitch_vlans.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitchreg.h2
-rw-r--r--sys/dev/etherswitch/arswitch/arswitchvar.h2
-rw-r--r--sys/dev/etherswitch/etherswitch.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175c.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175c.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175d.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip175d.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_phy.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_phy.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_reg.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_var.h2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_vlans.c2
-rw-r--r--sys/dev/etherswitch/ip17x/ip17x_vlans.h2
-rw-r--r--sys/dev/etherswitch/miiproxy.c2
-rw-r--r--sys/dev/etherswitch/miiproxy.h2
-rw-r--r--sys/dev/etherswitch/rtl8366/rtl8366rb.c2
-rw-r--r--sys/dev/etherswitch/rtl8366/rtl8366rbvar.h2
-rw-r--r--sys/dev/etherswitch/ukswitch/ukswitch.c2
-rw-r--r--sys/dev/exca/exca.c2
-rw-r--r--sys/dev/exca/excareg.h2
-rw-r--r--sys/dev/exca/excavar.h2
-rw-r--r--sys/dev/extres/syscon/syscon.c2
-rw-r--r--sys/dev/extres/syscon/syscon.h2
-rw-r--r--sys/dev/extres/syscon/syscon_generic.c2
-rw-r--r--sys/dev/extres/syscon/syscon_generic.h2
-rw-r--r--sys/dev/extres/syscon/syscon_power.c2
-rw-r--r--sys/dev/fb/fbd.c2
-rw-r--r--sys/dev/fb/fbreg.h2
-rw-r--r--sys/dev/fb/s3_pci.c2
-rw-r--r--sys/dev/fb/splash.c2
-rw-r--r--sys/dev/fb/splash_bmp.c2
-rw-r--r--sys/dev/fb/splash_txt.c2
-rw-r--r--sys/dev/fb/splashreg.h2
-rw-r--r--sys/dev/fb/vesa.c2
-rw-r--r--sys/dev/fb/vesa.h2
-rw-r--r--sys/dev/fb/vgareg.h2
-rw-r--r--sys/dev/fdc/fdc_acpi.c2
-rw-r--r--sys/dev/fdc/fdc_isa.c2
-rw-r--r--sys/dev/fdc/fdcvar.h2
-rw-r--r--sys/dev/fdt/fdt_common.c2
-rw-r--r--sys/dev/fdt/fdt_common.h2
-rw-r--r--sys/dev/fdt/fdt_slicer.c2
-rw-r--r--sys/dev/fdt/simple_mfd.c2
-rw-r--r--sys/dev/fdt/simple_mfd.h2
-rw-r--r--sys/dev/fdt/simplebus.c2
-rw-r--r--sys/dev/ffec/if_ffec.c2
-rw-r--r--sys/dev/ffec/if_ffecreg.h2
-rw-r--r--sys/dev/filemon/filemon.c2
-rw-r--r--sys/dev/filemon/filemon.h2
-rw-r--r--sys/dev/filemon/filemon_wrapper.c2
-rw-r--r--sys/dev/flash/at45d.c2
-rw-r--r--sys/dev/flash/mx25l.c2
-rw-r--r--sys/dev/flash/mx25lreg.h2
-rw-r--r--sys/dev/fxp/if_fxpvar.h2
-rw-r--r--sys/dev/glxiic/glxiic.c2
-rw-r--r--sys/dev/glxsb/glxsb.h2
-rw-r--r--sys/dev/glxsb/glxsb_hash.c2
-rw-r--r--sys/dev/goldfish/goldfish_rtc.c2
-rw-r--r--sys/dev/gpio/chvgpio.c2
-rw-r--r--sys/dev/gpio/chvgpio_reg.h2
-rw-r--r--sys/dev/gpio/gpiobus.c2
-rw-r--r--sys/dev/gpio/gpiobusvar.h2
-rw-r--r--sys/dev/gpio/gpioc.c2
-rw-r--r--sys/dev/gpio/gpioled.c2
-rw-r--r--sys/dev/gpio/gpiomdio.c2
-rw-r--r--sys/dev/gpio/ofw_gpiobus.c2
-rw-r--r--sys/dev/gpio/pl061.c2
-rw-r--r--sys/dev/gpio/pl061.h2
-rw-r--r--sys/dev/gpio/pl061_acpi.c2
-rw-r--r--sys/dev/gxemul/cons/gxemul_cons.c2
-rw-r--r--sys/dev/gxemul/disk/gxemul_disk.c2
-rw-r--r--sys/dev/gxemul/disk/gxemul_diskreg.h2
-rw-r--r--sys/dev/gxemul/ether/gxreg.h2
-rw-r--r--sys/dev/gxemul/ether/if_gx.c2
-rw-r--r--sys/dev/hid/bcm5974.c2
-rw-r--r--sys/dev/hid/hconf.c2
-rw-r--r--sys/dev/hid/hconf.h2
-rw-r--r--sys/dev/hid/hcons.c2
-rw-r--r--sys/dev/hid/hgame.c2
-rw-r--r--sys/dev/hid/hgame.h2
-rw-r--r--sys/dev/hid/hidbus.c2
-rw-r--r--sys/dev/hid/hidmap.c2
-rw-r--r--sys/dev/hid/hidmap.h2
-rw-r--r--sys/dev/hid/hidquirk.h2
-rw-r--r--sys/dev/hid/hidraw.h2
-rw-r--r--sys/dev/hid/hidrdesc.h2
-rw-r--r--sys/dev/hid/hms.c2
-rw-r--r--sys/dev/hid/hmt.c2
-rw-r--r--sys/dev/hid/hpen.c2
-rw-r--r--sys/dev/hid/hsctrl.c2
-rw-r--r--sys/dev/hid/ietp.c2
-rw-r--r--sys/dev/hid/ps4dshock.c2
-rw-r--r--sys/dev/hid/xb360gp.c2
-rw-r--r--sys/dev/hpt27xx/array.h2
-rw-r--r--sys/dev/hpt27xx/him.h2
-rw-r--r--sys/dev/hpt27xx/himfuncs.h2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_config.c2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_config.h2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_os_bsd.c2
-rw-r--r--sys/dev/hpt27xx/hpt27xx_osm_bsd.c2
-rw-r--r--sys/dev/hpt27xx/hptintf.h2
-rw-r--r--sys/dev/hpt27xx/ldm.h2
-rw-r--r--sys/dev/hpt27xx/list.h2
-rw-r--r--sys/dev/hpt27xx/os_bsd.h2
-rw-r--r--sys/dev/hpt27xx/osm.h2
-rw-r--r--sys/dev/hpt27xx/wj.h2
-rw-r--r--sys/dev/hptiop/hptiop.c2
-rw-r--r--sys/dev/hptiop/hptiop.h2
-rw-r--r--sys/dev/hptmv/access601.h2
-rw-r--r--sys/dev/hptmv/array.h2
-rw-r--r--sys/dev/hptmv/atapi.h2
-rw-r--r--sys/dev/hptmv/command.h2
-rw-r--r--sys/dev/hptmv/entry.c2
-rw-r--r--sys/dev/hptmv/global.h2
-rw-r--r--sys/dev/hptmv/gui_lib.c2
-rw-r--r--sys/dev/hptmv/hptintf.h2
-rw-r--r--sys/dev/hptmv/hptproc.c2
-rw-r--r--sys/dev/hptmv/ioctl.c2
-rw-r--r--sys/dev/hptmv/mv.c2
-rw-r--r--sys/dev/hptmv/mvOs.h2
-rw-r--r--sys/dev/hptmv/mvSata.h2
-rw-r--r--sys/dev/hptmv/mvStorageDev.h2
-rw-r--r--sys/dev/hptmv/osbsd.h2
-rw-r--r--sys/dev/hptmv/raid5n.h2
-rw-r--r--sys/dev/hptmv/vdevice.h2
-rw-r--r--sys/dev/hptnr/array.h2
-rw-r--r--sys/dev/hptnr/him.h2
-rw-r--r--sys/dev/hptnr/himfuncs.h2
-rw-r--r--sys/dev/hptnr/hptintf.h2
-rw-r--r--sys/dev/hptnr/hptnr_config.c2
-rw-r--r--sys/dev/hptnr/hptnr_config.h2
-rw-r--r--sys/dev/hptnr/hptnr_os_bsd.c2
-rw-r--r--sys/dev/hptnr/hptnr_osm_bsd.c2
-rw-r--r--sys/dev/hptnr/ldm.h2
-rw-r--r--sys/dev/hptnr/list.h2
-rw-r--r--sys/dev/hptnr/os_bsd.h2
-rw-r--r--sys/dev/hptnr/osm.h2
-rw-r--r--sys/dev/hptnr/wj.h2
-rw-r--r--sys/dev/hptrr/array.h2
-rw-r--r--sys/dev/hptrr/him.h2
-rw-r--r--sys/dev/hptrr/himfuncs.h2
-rw-r--r--sys/dev/hptrr/hptintf.h2
-rw-r--r--sys/dev/hptrr/hptrr_config.c2
-rw-r--r--sys/dev/hptrr/hptrr_config.h2
-rw-r--r--sys/dev/hptrr/hptrr_os_bsd.c2
-rw-r--r--sys/dev/hptrr/hptrr_osm_bsd.c2
-rw-r--r--sys/dev/hptrr/ldm.h2
-rw-r--r--sys/dev/hptrr/list.h2
-rw-r--r--sys/dev/hptrr/os_bsd.h2
-rw-r--r--sys/dev/hptrr/osm.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_amd.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_amd.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_arm.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_core.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_core.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_intel.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_logging.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mips.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mips24k.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mod.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mpc7xxx.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_octeon.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_power8.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_powerpc.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_powerpc.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_ppc970.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_soft.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_soft.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_tsc.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_tsc.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_uncore.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_uncore.h2
-rw-r--r--sys/dev/hwpmc/hwpmc_x86.c2
-rw-r--r--sys/dev/hwpmc/pmc_events.h2
-rw-r--r--sys/dev/hyperv/hvsock/hv_sock.c2
-rw-r--r--sys/dev/hyperv/hvsock/hv_sock.h2
-rw-r--r--sys/dev/hyperv/include/hyperv.h2
-rw-r--r--sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c2
-rw-r--r--sys/dev/hyperv/storvsc/hv_vstorage.h2
-rw-r--r--sys/dev/hyperv/utilities/hv_kvp.h2
-rw-r--r--sys/dev/ic/cd180.h2
-rw-r--r--sys/dev/ic/i8259.h2
-rw-r--r--sys/dev/ic/quicc.h2
-rw-r--r--sys/dev/ic/z8530.h2
-rw-r--r--sys/dev/ichwd/ichwd.c2
-rw-r--r--sys/dev/ichwd/ichwd.h2
-rw-r--r--sys/dev/ida/ida.c2
-rw-r--r--sys/dev/ida/ida_disk.c2
-rw-r--r--sys/dev/ida/ida_pci.c2
-rw-r--r--sys/dev/ida/idareg.h2
-rw-r--r--sys/dev/ida/idavar.h2
-rw-r--r--sys/dev/iicbus/acpi_iicbus.c2
-rw-r--r--sys/dev/iicbus/ad7417.c2
-rw-r--r--sys/dev/iicbus/ad7418.c2
-rw-r--r--sys/dev/iicbus/adt746x.c2
-rw-r--r--sys/dev/iicbus/ds1631.c2
-rw-r--r--sys/dev/iicbus/ds1672.c2
-rw-r--r--sys/dev/iicbus/ds1775.c2
-rw-r--r--sys/dev/iicbus/gpio/tca6416.c2
-rw-r--r--sys/dev/iicbus/icee.c2
-rw-r--r--sys/dev/iicbus/if_ic.c2
-rw-r--r--sys/dev/iicbus/iic.c2
-rw-r--r--sys/dev/iicbus/iic.h2
-rw-r--r--sys/dev/iicbus/iicbb.c2
-rw-r--r--sys/dev/iicbus/iicbus.c2
-rw-r--r--sys/dev/iicbus/iicbus.h2
-rw-r--r--sys/dev/iicbus/iicoc.c2
-rw-r--r--sys/dev/iicbus/iicoc.h2
-rw-r--r--sys/dev/iicbus/iicoc_fdt.c2
-rw-r--r--sys/dev/iicbus/iicoc_pci.c2
-rw-r--r--sys/dev/iicbus/iiconf.c2
-rw-r--r--sys/dev/iicbus/iiconf.h2
-rw-r--r--sys/dev/iicbus/iicsmb.c2
-rw-r--r--sys/dev/iicbus/max6690.c2
-rw-r--r--sys/dev/iicbus/pmic/act8846.c2
-rw-r--r--sys/dev/iicbus/pmic/act8846.h2
-rw-r--r--sys/dev/iicbus/pmic/act8846_reg.h2
-rw-r--r--sys/dev/iicbus/pmic/act8846_regulator.c2
-rw-r--r--sys/dev/iicbus/pmic/fan53555.c2
-rw-r--r--sys/dev/iicbus/rtc/rx8803.c2
-rw-r--r--sys/dev/iicbus/s35390a.c2
-rw-r--r--sys/dev/iicbus/syr827.c2
-rw-r--r--sys/dev/imcsmb/imcsmb.c2
-rw-r--r--sys/dev/imcsmb/imcsmb_pci.c2
-rw-r--r--sys/dev/imcsmb/imcsmb_reg.h2
-rw-r--r--sys/dev/imcsmb/imcsmb_var.h2
-rw-r--r--sys/dev/io/iodev.c2
-rw-r--r--sys/dev/io/iodev.h2
-rw-r--r--sys/dev/iommu/busdma_iommu.c2
-rw-r--r--sys/dev/iommu/busdma_iommu.h2
-rw-r--r--sys/dev/iommu/iommu.h2
-rw-r--r--sys/dev/iommu/iommu_gas.c2
-rw-r--r--sys/dev/iommu/iommu_gas.h2
-rw-r--r--sys/dev/iommu/iommu_types.h2
-rw-r--r--sys/dev/ipmi/ipmi.c2
-rw-r--r--sys/dev/ipmi/ipmi_acpi.c2
-rw-r--r--sys/dev/ipmi/ipmi_isa.c2
-rw-r--r--sys/dev/ipmi/ipmi_kcs.c2
-rw-r--r--sys/dev/ipmi/ipmi_linux.c2
-rw-r--r--sys/dev/ipmi/ipmi_pci.c2
-rw-r--r--sys/dev/ipmi/ipmi_smbios.c2
-rw-r--r--sys/dev/ipmi/ipmi_smbus.c2
-rw-r--r--sys/dev/ipmi/ipmi_smic.c2
-rw-r--r--sys/dev/ipmi/ipmi_ssif.c2
-rw-r--r--sys/dev/ipmi/ipmivars.h2
-rw-r--r--sys/dev/ips/ips.c2
-rw-r--r--sys/dev/ips/ips.h2
-rw-r--r--sys/dev/ips/ips_commands.c2
-rw-r--r--sys/dev/ips/ips_disk.c2
-rw-r--r--sys/dev/ips/ips_disk.h2
-rw-r--r--sys/dev/ips/ips_ioctl.c2
-rw-r--r--sys/dev/ips/ips_ioctl.h2
-rw-r--r--sys/dev/ips/ips_pci.c2
-rw-r--r--sys/dev/ips/ipsreg.h2
-rw-r--r--sys/dev/ipw/if_ipw.c2
-rw-r--r--sys/dev/ipw/if_ipwreg.h2
-rw-r--r--sys/dev/ipw/if_ipwvar.h2
-rw-r--r--sys/dev/isci/types.h2
-rw-r--r--sys/dev/iscsi/icl.c2
-rw-r--r--sys/dev/iscsi/icl.h2
-rw-r--r--sys/dev/iscsi/icl_conn_if.m2
-rw-r--r--sys/dev/iscsi/icl_soft.c2
-rw-r--r--sys/dev/iscsi/icl_wrappers.h2
-rw-r--r--sys/dev/iscsi/iscsi.c2
-rw-r--r--sys/dev/iscsi/iscsi.h2
-rw-r--r--sys/dev/iscsi/iscsi_ioctl.h2
-rw-r--r--sys/dev/iscsi/iscsi_proto.h2
-rw-r--r--sys/dev/iscsi_initiator/isc_cam.c2
-rw-r--r--sys/dev/iscsi_initiator/isc_sm.c2
-rw-r--r--sys/dev/iscsi_initiator/isc_soc.c2
-rw-r--r--sys/dev/iscsi_initiator/isc_subr.c2
-rw-r--r--sys/dev/iscsi_initiator/iscsi.c2
-rw-r--r--sys/dev/iscsi_initiator/iscsi.h2
-rw-r--r--sys/dev/iscsi_initiator/iscsi_subr.c2
-rw-r--r--sys/dev/iscsi_initiator/iscsivar.h2
-rw-r--r--sys/dev/isp/isp.c2
-rw-r--r--sys/dev/isp/isp_freebsd.c2
-rw-r--r--sys/dev/isp/isp_freebsd.h2
-rw-r--r--sys/dev/isp/isp_ioctl.h2
-rw-r--r--sys/dev/isp/isp_library.c2
-rw-r--r--sys/dev/isp/isp_library.h2
-rw-r--r--sys/dev/isp/isp_pci.c2
-rw-r--r--sys/dev/isp/isp_stds.h2
-rw-r--r--sys/dev/isp/isp_target.c2
-rw-r--r--sys/dev/isp/isp_target.h2
-rw-r--r--sys/dev/isp/ispmbox.h2
-rw-r--r--sys/dev/isp/ispreg.h2
-rw-r--r--sys/dev/isp/ispvar.h2
-rw-r--r--sys/dev/ispfw/ispfw.c2
-rw-r--r--sys/dev/iwi/if_iwi.c2
-rw-r--r--sys/dev/iwi/if_iwireg.h2
-rw-r--r--sys/dev/iwi/if_iwivar.h2
-rw-r--r--sys/dev/jedec_dimm/jedec_dimm.c2
-rw-r--r--sys/dev/jedec_dimm/jedec_dimm.h2
-rw-r--r--sys/dev/jme/if_jme.c2
-rw-r--r--sys/dev/jme/if_jmereg.h2
-rw-r--r--sys/dev/jme/if_jmevar.h2
-rw-r--r--sys/dev/kbd/kbd.c2
-rw-r--r--sys/dev/kbd/kbdreg.h2
-rw-r--r--sys/dev/kbd/kbdtables.h2
-rw-r--r--sys/dev/kbdmux/kbdmux.c2
-rw-r--r--sys/dev/ksyms/ksyms.c2
-rw-r--r--sys/dev/kvm_clock/kvm_clock.c2
-rw-r--r--sys/dev/malo/if_malo.c2
-rw-r--r--sys/dev/malo/if_malo.h2
-rw-r--r--sys/dev/malo/if_malo_pci.c2
-rw-r--r--sys/dev/malo/if_malohal.c2
-rw-r--r--sys/dev/malo/if_malohal.h2
-rw-r--r--sys/dev/malo/if_maloioctl.h2
-rw-r--r--sys/dev/mem/memdev.c2
-rw-r--r--sys/dev/mem/memutil.c2
-rw-r--r--sys/dev/mfi/mfi.c2
-rw-r--r--sys/dev/mfi/mfi_cam.c2
-rw-r--r--sys/dev/mfi/mfi_debug.c2
-rw-r--r--sys/dev/mfi/mfi_disk.c2
-rw-r--r--sys/dev/mfi/mfi_ioctl.h2
-rw-r--r--sys/dev/mfi/mfi_linux.c2
-rw-r--r--sys/dev/mfi/mfi_pci.c2
-rw-r--r--sys/dev/mfi/mfi_syspd.c2
-rw-r--r--sys/dev/mfi/mfi_tbolt.c2
-rw-r--r--sys/dev/mfi/mfireg.h2
-rw-r--r--sys/dev/mfi/mfivar.h2
-rw-r--r--sys/dev/mii/acphyreg.h2
-rw-r--r--sys/dev/mii/atphy.c2
-rw-r--r--sys/dev/mii/atphyreg.h2
-rw-r--r--sys/dev/mii/axphy.c2
-rw-r--r--sys/dev/mii/ip1000phy.c2
-rw-r--r--sys/dev/mii/ip1000phyreg.h2
-rw-r--r--sys/dev/mii/jmphy.c2
-rw-r--r--sys/dev/mii/jmphyreg.h2
-rw-r--r--sys/dev/mii/rdcphy.c2
-rw-r--r--sys/dev/mii/rdcphyreg.h2
-rw-r--r--sys/dev/mii/smcphy.c2
-rw-r--r--sys/dev/mii/smscphy.c2
-rw-r--r--sys/dev/mii/tdkphy.c2
-rw-r--r--sys/dev/mii/tdkphyreg.h2
-rw-r--r--sys/dev/mlx/mlx.c2
-rw-r--r--sys/dev/mlx/mlx_disk.c2
-rw-r--r--sys/dev/mlx/mlx_pci.c2
-rw-r--r--sys/dev/mlx/mlxio.h2
-rw-r--r--sys/dev/mlx/mlxreg.h2
-rw-r--r--sys/dev/mlx/mlxvar.h2
-rw-r--r--sys/dev/mly/mly.c2
-rw-r--r--sys/dev/mly/mly_tables.h2
-rw-r--r--sys/dev/mly/mlyio.h2
-rw-r--r--sys/dev/mly/mlyreg.h2
-rw-r--r--sys/dev/mly/mlyvar.h2
-rw-r--r--sys/dev/mmc/bridge.h2
-rw-r--r--sys/dev/mmc/mmc.c2
-rw-r--r--sys/dev/mmc/mmc_pwrseq.c2
-rw-r--r--sys/dev/mmc/mmc_pwrseq_if.m2
-rw-r--r--sys/dev/mmc/mmcbrvar.h2
-rw-r--r--sys/dev/mmc/mmcreg.h2
-rw-r--r--sys/dev/mmc/mmcsd.c2
-rw-r--r--sys/dev/mmc/mmcvar.h2
-rw-r--r--sys/dev/mps/mpi/mpi2.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_cnfg.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_hbd.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_init.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_ioc.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_ra.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_raid.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_sas.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_targ.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_tool.h2
-rw-r--r--sys/dev/mps/mpi/mpi2_type.h2
-rw-r--r--sys/dev/mps/mps.c2
-rw-r--r--sys/dev/mps/mps_config.c2
-rw-r--r--sys/dev/mps/mps_mapping.c2
-rw-r--r--sys/dev/mps/mps_mapping.h2
-rw-r--r--sys/dev/mps/mps_pci.c2
-rw-r--r--sys/dev/mps/mps_sas.c2
-rw-r--r--sys/dev/mps/mps_sas.h2
-rw-r--r--sys/dev/mps/mps_sas_lsi.c2
-rw-r--r--sys/dev/mps/mps_table.c2
-rw-r--r--sys/dev/mps/mps_table.h2
-rw-r--r--sys/dev/mps/mpsvar.h2
-rw-r--r--sys/dev/mpt/mpt.c2
-rw-r--r--sys/dev/mpt/mpt.h2
-rw-r--r--sys/dev/mpt/mpt_cam.c2
-rw-r--r--sys/dev/mpt/mpt_cam.h2
-rw-r--r--sys/dev/mpt/mpt_debug.c2
-rw-r--r--sys/dev/mpt/mpt_pci.c2
-rw-r--r--sys/dev/mpt/mpt_reg.h2
-rw-r--r--sys/dev/mvs/mvs.c2
-rw-r--r--sys/dev/mvs/mvs.h2
-rw-r--r--sys/dev/mvs/mvs_pci.c2
-rw-r--r--sys/dev/mvs/mvs_soc.c2
-rw-r--r--sys/dev/mwl/if_mwl.c2
-rw-r--r--sys/dev/mwl/if_mwl_pci.c2
-rw-r--r--sys/dev/mwl/if_mwlioctl.h2
-rw-r--r--sys/dev/mwl/if_mwlvar.h2
-rw-r--r--sys/dev/mwl/mwldiag.h2
-rw-r--r--sys/dev/mwl/mwlhal.c2
-rw-r--r--sys/dev/mwl/mwlhal.h2
-rw-r--r--sys/dev/mwl/mwlreg.h2
-rw-r--r--sys/dev/mxge/eth_z8e.h2
-rw-r--r--sys/dev/mxge/ethp_z8e.h2
-rw-r--r--sys/dev/mxge/if_mxge.c2
-rw-r--r--sys/dev/mxge/if_mxge_var.h2
-rw-r--r--sys/dev/mxge/mcp_gen_header.h2
-rw-r--r--sys/dev/mxge/mxge_mcp.h2
-rw-r--r--sys/dev/mxge/rss_eth_z8e.h2
-rw-r--r--sys/dev/mxge/rss_ethp_z8e.h2
-rw-r--r--sys/dev/my/if_my.c2
-rw-r--r--sys/dev/my/if_myreg.h2
-rw-r--r--sys/dev/netmap/if_re_netmap.h2
-rw-r--r--sys/dev/netmap/netmap.c2
-rw-r--r--sys/dev/netmap/netmap_bdg.h2
-rw-r--r--sys/dev/netmap/netmap_freebsd.c2
-rw-r--r--sys/dev/netmap/netmap_generic.c2
-rw-r--r--sys/dev/netmap/netmap_kern.h2
-rw-r--r--sys/dev/netmap/netmap_legacy.c2
-rw-r--r--sys/dev/netmap/netmap_mbq.c2
-rw-r--r--sys/dev/netmap/netmap_mbq.h2
-rw-r--r--sys/dev/netmap/netmap_mem2.c2
-rw-r--r--sys/dev/netmap/netmap_mem2.h2
-rw-r--r--sys/dev/netmap/netmap_offloadings.c2
-rw-r--r--sys/dev/netmap/netmap_pipe.c2
-rw-r--r--sys/dev/netmap/netmap_vale.c2
-rw-r--r--sys/dev/null/null.c2
-rw-r--r--sys/dev/nvd/nvd.c2
-rw-r--r--sys/dev/nvdimm/nvdimm_e820.c2
-rw-r--r--sys/dev/nvme/nvme.c2
-rw-r--r--sys/dev/nvme/nvme.h2
-rw-r--r--sys/dev/nvme/nvme_ctrlr.c2
-rw-r--r--sys/dev/nvme/nvme_ctrlr_cmd.c2
-rw-r--r--sys/dev/nvme/nvme_ns.c2
-rw-r--r--sys/dev/nvme/nvme_ns_cmd.c2
-rw-r--r--sys/dev/nvme/nvme_private.h2
-rw-r--r--sys/dev/nvme/nvme_qpair.c2
-rw-r--r--sys/dev/nvme/nvme_sysctl.c2
-rw-r--r--sys/dev/nvme/nvme_test.c2
-rw-r--r--sys/dev/nvme/nvme_util.c2
-rw-r--r--sys/dev/nvram/nvram.c2
-rw-r--r--sys/dev/nvram2env/nvram2env.c2
-rw-r--r--sys/dev/ofw/ofw_bus.h2
-rw-r--r--sys/dev/ofw/ofw_bus_subr.c2
-rw-r--r--sys/dev/ofw/ofw_bus_subr.h2
-rw-r--r--sys/dev/ofw/ofw_console.c2
-rw-r--r--sys/dev/ofw/ofw_disk.c2
-rw-r--r--sys/dev/ofw/ofw_fdt.c2
-rw-r--r--sys/dev/ofw/ofw_graph.c2
-rw-r--r--sys/dev/ofw/ofw_graph.h2
-rw-r--r--sys/dev/ofw/ofw_standard.c2
-rw-r--r--sys/dev/ofw/ofwvar.h2
-rw-r--r--sys/dev/ofw/openfirm.h2
-rw-r--r--sys/dev/pbio/pbio.c2
-rw-r--r--sys/dev/pbio/pbioio.h2
-rw-r--r--sys/dev/pccard/pccard_device.c2
-rw-r--r--sys/dev/pccard/pccardvarp.h2
-rw-r--r--sys/dev/pccbb/pccbb.c2
-rw-r--r--sys/dev/pccbb/pccbb_pci.c2
-rw-r--r--sys/dev/pccbb/pccbbdevid.h2
-rw-r--r--sys/dev/pccbb/pccbbreg.h2
-rw-r--r--sys/dev/pccbb/pccbbvar.h2
-rw-r--r--sys/dev/pcf/pcf.c2
-rw-r--r--sys/dev/pcf/pcf_isa.c2
-rw-r--r--sys/dev/pcf/pcfvar.h2
-rw-r--r--sys/dev/pci/hostb_pci.c2
-rw-r--r--sys/dev/pci/ignore_pci.c2
-rw-r--r--sys/dev/pci/pci.c2
-rw-r--r--sys/dev/pci/pci_dw.c2
-rw-r--r--sys/dev/pci/pci_dw.h2
-rw-r--r--sys/dev/pci/pci_dw_mv.c2
-rw-r--r--sys/dev/pci/pci_private.h2
-rw-r--r--sys/dev/pci/pci_subr.c2
-rw-r--r--sys/dev/pci/pci_user.c2
-rw-r--r--sys/dev/pci/pcireg.h2
-rw-r--r--sys/dev/pci/pcivar.h2
-rw-r--r--sys/dev/pci/vga_pci.c2
-rw-r--r--sys/dev/powermac_nvram/powermac_nvram.c2
-rw-r--r--sys/dev/powermac_nvram/powermac_nvramvar.h2
-rw-r--r--sys/dev/ppbus/if_plip.c2
-rw-r--r--sys/dev/ppbus/lpbb.c2
-rw-r--r--sys/dev/ppbus/lpt.h2
-rw-r--r--sys/dev/ppbus/pcfclock.c2
-rw-r--r--sys/dev/ppbus/ppb_1284.c2
-rw-r--r--sys/dev/ppbus/ppb_1284.h2
-rw-r--r--sys/dev/ppbus/ppb_base.c2
-rw-r--r--sys/dev/ppbus/ppb_msq.c2
-rw-r--r--sys/dev/ppbus/ppb_msq.h2
-rw-r--r--sys/dev/ppbus/ppbconf.c2
-rw-r--r--sys/dev/ppbus/ppbconf.h2
-rw-r--r--sys/dev/ppbus/ppbio.h2
-rw-r--r--sys/dev/ppbus/ppi.c2
-rw-r--r--sys/dev/ppbus/ppi.h2
-rw-r--r--sys/dev/ppc/ppc.c2
-rw-r--r--sys/dev/ppc/ppc_acpi.c2
-rw-r--r--sys/dev/ppc/ppc_isa.c2
-rw-r--r--sys/dev/ppc/ppc_pci.c2
-rw-r--r--sys/dev/ppc/ppc_puc.c2
-rw-r--r--sys/dev/ppc/ppcreg.h2
-rw-r--r--sys/dev/ppc/ppcvar.h2
-rw-r--r--sys/dev/pst/pst-raid.c2
-rw-r--r--sys/dev/pty/pty.c2
-rw-r--r--sys/dev/puc/puc.c2
-rw-r--r--sys/dev/puc/puc_bfe.h2
-rw-r--r--sys/dev/puc/puc_bus.h2
-rw-r--r--sys/dev/puc/puc_cfg.c2
-rw-r--r--sys/dev/puc/puc_cfg.h2
-rw-r--r--sys/dev/puc/puc_pci.c2
-rw-r--r--sys/dev/puc/pucdata.c2
-rw-r--r--sys/dev/pwm/ofw_pwm.c2
-rw-r--r--sys/dev/pwm/ofw_pwm.h2
-rw-r--r--sys/dev/pwm/ofw_pwmbus.c2
-rw-r--r--sys/dev/pwm/pwm_backlight.c2
-rw-r--r--sys/dev/pwm/pwmbus.c2
-rw-r--r--sys/dev/pwm/pwmbus.h2
-rw-r--r--sys/dev/pwm/pwmbus_if.m2
-rw-r--r--sys/dev/pwm/pwmc.c2
-rw-r--r--sys/dev/pwm/pwmc.h2
-rw-r--r--sys/dev/qlxgb/qla_dbg.c2
-rw-r--r--sys/dev/qlxgb/qla_dbg.h2
-rw-r--r--sys/dev/qlxgb/qla_def.h2
-rw-r--r--sys/dev/qlxgb/qla_glbl.h2
-rw-r--r--sys/dev/qlxgb/qla_hw.c2
-rw-r--r--sys/dev/qlxgb/qla_hw.h2
-rw-r--r--sys/dev/qlxgb/qla_inline.h2
-rw-r--r--sys/dev/qlxgb/qla_ioctl.c2
-rw-r--r--sys/dev/qlxgb/qla_ioctl.h2
-rw-r--r--sys/dev/qlxgb/qla_isr.c2
-rw-r--r--sys/dev/qlxgb/qla_misc.c2
-rw-r--r--sys/dev/qlxgb/qla_os.c2
-rw-r--r--sys/dev/qlxgb/qla_os.h2
-rw-r--r--sys/dev/qlxgb/qla_reg.h2
-rw-r--r--sys/dev/qlxgb/qla_ver.h2
-rw-r--r--sys/dev/qlxgbe/ql_dbg.c2
-rw-r--r--sys/dev/qlxgbe/ql_dbg.h2
-rw-r--r--sys/dev/qlxgbe/ql_def.h2
-rw-r--r--sys/dev/qlxgbe/ql_glbl.h2
-rw-r--r--sys/dev/qlxgbe/ql_hw.c2
-rw-r--r--sys/dev/qlxgbe/ql_hw.h2
-rw-r--r--sys/dev/qlxgbe/ql_inline.h2
-rw-r--r--sys/dev/qlxgbe/ql_ioctl.c2
-rw-r--r--sys/dev/qlxgbe/ql_ioctl.h2
-rw-r--r--sys/dev/qlxgbe/ql_isr.c2
-rw-r--r--sys/dev/qlxgbe/ql_misc.c2
-rw-r--r--sys/dev/qlxgbe/ql_os.c2
-rw-r--r--sys/dev/qlxgbe/ql_os.h2
-rw-r--r--sys/dev/qlxgbe/ql_reset.c2
-rw-r--r--sys/dev/qlxgbe/ql_tmplt.h2
-rw-r--r--sys/dev/qlxgbe/ql_ver.h2
-rw-r--r--sys/dev/qlxge/qls_dbg.c2
-rw-r--r--sys/dev/qlxge/qls_dbg.h2
-rw-r--r--sys/dev/qlxge/qls_def.h2
-rw-r--r--sys/dev/qlxge/qls_dump.c2
-rw-r--r--sys/dev/qlxge/qls_dump.h2
-rw-r--r--sys/dev/qlxge/qls_glbl.h2
-rw-r--r--sys/dev/qlxge/qls_hw.c2
-rw-r--r--sys/dev/qlxge/qls_hw.h2
-rw-r--r--sys/dev/qlxge/qls_inline.h2
-rw-r--r--sys/dev/qlxge/qls_ioctl.c2
-rw-r--r--sys/dev/qlxge/qls_ioctl.h2
-rw-r--r--sys/dev/qlxge/qls_isr.c4
-rw-r--r--sys/dev/qlxge/qls_os.c2
-rw-r--r--sys/dev/qlxge/qls_os.h2
-rw-r--r--sys/dev/qlxge/qls_ver.h2
-rw-r--r--sys/dev/quicc/quicc_bus.h2
-rw-r--r--sys/dev/random/fenestrasX/fx_brng.c2
-rw-r--r--sys/dev/random/fenestrasX/fx_brng.h2
-rw-r--r--sys/dev/random/fenestrasX/fx_hash.h2
-rw-r--r--sys/dev/random/fenestrasX/fx_main.c2
-rw-r--r--sys/dev/random/fenestrasX/fx_pool.c2
-rw-r--r--sys/dev/random/fenestrasX/fx_pool.h2
-rw-r--r--sys/dev/random/fenestrasX/fx_priv.h2
-rw-r--r--sys/dev/random/fenestrasX/fx_pub.h2
-rw-r--r--sys/dev/random/fenestrasX/fx_rng.c2
-rw-r--r--sys/dev/random/fenestrasX/fx_rng.h2
-rw-r--r--sys/dev/rt/if_rt.c2
-rw-r--r--sys/dev/rt/if_rtreg.h2
-rw-r--r--sys/dev/rt/if_rtvar.h2
-rw-r--r--sys/dev/rtsx/rtsx.c2
-rw-r--r--sys/dev/rtsx/rtsxreg.h2
-rw-r--r--sys/dev/safe/safe.c2
-rw-r--r--sys/dev/safe/safereg.h2
-rw-r--r--sys/dev/safe/safevar.h2
-rw-r--r--sys/dev/safexcel/safexcel.c2
-rw-r--r--sys/dev/safexcel/safexcel_reg.h2
-rw-r--r--sys/dev/safexcel/safexcel_var.h2
-rw-r--r--sys/dev/scc/scc_bfe.h2
-rw-r--r--sys/dev/scc/scc_bfe_macio.c2
-rw-r--r--sys/dev/scc/scc_bfe_quicc.c2
-rw-r--r--sys/dev/scc/scc_bus.h2
-rw-r--r--sys/dev/scc/scc_core.c2
-rw-r--r--sys/dev/scc/scc_dev_quicc.c2
-rw-r--r--sys/dev/scc/scc_dev_z8530.c2
-rw-r--r--sys/dev/sdhci/sdhci.c2
-rw-r--r--sys/dev/sdhci/sdhci.h2
-rw-r--r--sys/dev/sdhci/sdhci_fdt.c2
-rw-r--r--sys/dev/sdhci/sdhci_fsl_fdt.c2
-rw-r--r--sys/dev/sdhci/sdhci_pci.c2
-rw-r--r--sys/dev/sdhci/sdhci_xenon.c2
-rw-r--r--sys/dev/sdhci/sdhci_xenon_acpi.c2
-rw-r--r--sys/dev/sdhci/sdhci_xenon_fdt.c2
-rw-r--r--sys/dev/sec/sec.c2
-rw-r--r--sys/dev/sec/sec.h2
-rw-r--r--sys/dev/sfxge/common/ef10_image.c2
-rw-r--r--sys/dev/sfxge/common/ef10_signed_image_layout.h2
-rw-r--r--sys/dev/sfxge/common/efsys.h2
-rw-r--r--sys/dev/sfxge/common/efx.h2
-rw-r--r--sys/dev/sfxge/common/efx_annote.h2
-rw-r--r--sys/dev/sfxge/common/efx_bootcfg.c2
-rw-r--r--sys/dev/sfxge/common/efx_ev.c2
-rw-r--r--sys/dev/sfxge/common/efx_filter.c2
-rw-r--r--sys/dev/sfxge/common/efx_impl.h2
-rw-r--r--sys/dev/sfxge/common/efx_intr.c2
-rw-r--r--sys/dev/sfxge/common/efx_mac.c2
-rw-r--r--sys/dev/sfxge/common/efx_mcdi.c2
-rw-r--r--sys/dev/sfxge/common/efx_mcdi.h2
-rw-r--r--sys/dev/sfxge/common/efx_mon.c2
-rw-r--r--sys/dev/sfxge/common/efx_nic.c2
-rw-r--r--sys/dev/sfxge/common/efx_nvram.c2
-rw-r--r--sys/dev/sfxge/common/efx_phy.c2
-rw-r--r--sys/dev/sfxge/common/efx_port.c2
-rw-r--r--sys/dev/sfxge/common/efx_regs.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_ef10.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_mcdi.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_mcdi_aoe.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_mcdi_strs.h2
-rw-r--r--sys/dev/sfxge/common/efx_regs_pci.h2
-rw-r--r--sys/dev/sfxge/common/efx_rx.c2
-rw-r--r--sys/dev/sfxge/common/efx_sram.c2
-rw-r--r--sys/dev/sfxge/common/efx_tunnel.c2
-rw-r--r--sys/dev/sfxge/common/efx_tx.c2
-rw-r--r--sys/dev/sfxge/common/efx_types.h2
-rw-r--r--sys/dev/sfxge/common/efx_vpd.c2
-rw-r--r--sys/dev/sfxge/common/medford2_impl.h2
-rw-r--r--sys/dev/sfxge/common/medford2_nic.c2
-rw-r--r--sys/dev/sfxge/common/siena_flash.h2
-rw-r--r--sys/dev/sfxge/common/siena_impl.h2
-rw-r--r--sys/dev/sfxge/common/siena_mac.c2
-rw-r--r--sys/dev/sfxge/common/siena_nic.c2
-rw-r--r--sys/dev/sfxge/common/siena_nvram.c2
-rw-r--r--sys/dev/sfxge/common/siena_phy.c2
-rw-r--r--sys/dev/sfxge/common/siena_sram.c2
-rw-r--r--sys/dev/sfxge/common/siena_vpd.c2
-rw-r--r--sys/dev/sfxge/sfxge.c2
-rw-r--r--sys/dev/sfxge/sfxge.h2
-rw-r--r--sys/dev/sfxge/sfxge_dma.c2
-rw-r--r--sys/dev/sfxge/sfxge_ev.c2
-rw-r--r--sys/dev/sfxge/sfxge_intr.c2
-rw-r--r--sys/dev/sfxge/sfxge_mcdi.c2
-rw-r--r--sys/dev/sfxge/sfxge_port.c2
-rw-r--r--sys/dev/sfxge/sfxge_rx.c2
-rw-r--r--sys/dev/sfxge/sfxge_rx.h2
-rw-r--r--sys/dev/sfxge/sfxge_tx.c2
-rw-r--r--sys/dev/sfxge/sfxge_tx.h2
-rw-r--r--sys/dev/siis/siis.c2
-rw-r--r--sys/dev/siis/siis.h2
-rw-r--r--sys/dev/smbios/smbios.c2
-rw-r--r--sys/dev/smbios/smbios.h2
-rw-r--r--sys/dev/smbus/smb.c2
-rw-r--r--sys/dev/smbus/smb.h2
-rw-r--r--sys/dev/smbus/smbconf.c2
-rw-r--r--sys/dev/smbus/smbconf.h2
-rw-r--r--sys/dev/smbus/smbus.c2
-rw-r--r--sys/dev/smbus/smbus.h2
-rw-r--r--sys/dev/smc/if_smc.c2
-rw-r--r--sys/dev/smc/if_smcreg.h2
-rw-r--r--sys/dev/smc/if_smcvar.h2
-rw-r--r--sys/dev/snp/snp.c2
-rw-r--r--sys/dev/sound/chip.h2
-rw-r--r--sys/dev/sound/clone.c2
-rw-r--r--sys/dev/sound/clone.h2
-rw-r--r--sys/dev/sound/driver.c2
-rw-r--r--sys/dev/sound/isa/ad1816.c2
-rw-r--r--sys/dev/sound/isa/ad1816.h2
-rw-r--r--sys/dev/sound/isa/ess.c2
-rw-r--r--sys/dev/sound/isa/gusc.c2
-rw-r--r--sys/dev/sound/isa/mss.c2
-rw-r--r--sys/dev/sound/isa/mss.h2
-rw-r--r--sys/dev/sound/isa/sb.h2
-rw-r--r--sys/dev/sound/isa/sb16.c2
-rw-r--r--sys/dev/sound/isa/sb8.c2
-rw-r--r--sys/dev/sound/isa/sbc.c2
-rw-r--r--sys/dev/sound/isa/sndbuf_dma.c2
-rw-r--r--sys/dev/sound/macio/aoa.c2
-rw-r--r--sys/dev/sound/macio/aoa.h2
-rw-r--r--sys/dev/sound/macio/davbus.c2
-rw-r--r--sys/dev/sound/macio/davbusreg.h2
-rw-r--r--sys/dev/sound/macio/i2s.c2
-rw-r--r--sys/dev/sound/macio/onyx.c2
-rw-r--r--sys/dev/sound/macio/snapper.c2
-rw-r--r--sys/dev/sound/macio/tumbler.c2
-rw-r--r--sys/dev/sound/midi/midi.h2
-rw-r--r--sys/dev/sound/midi/midiq.h2
-rw-r--r--sys/dev/sound/midi/mpu401.c2
-rw-r--r--sys/dev/sound/midi/mpu401.h2
-rw-r--r--sys/dev/sound/midi/sequencer.c2
-rw-r--r--sys/dev/sound/midi/sequencer.h2
-rw-r--r--sys/dev/sound/pci/allegro_code.h2
-rw-r--r--sys/dev/sound/pci/allegro_reg.h2
-rw-r--r--sys/dev/sound/pci/als4000.c2
-rw-r--r--sys/dev/sound/pci/als4000.h2
-rw-r--r--sys/dev/sound/pci/atiixp.c2
-rw-r--r--sys/dev/sound/pci/atiixp.h2
-rw-r--r--sys/dev/sound/pci/cmi.c2
-rw-r--r--sys/dev/sound/pci/cs4281.c2
-rw-r--r--sys/dev/sound/pci/cs4281.h2
-rw-r--r--sys/dev/sound/pci/cs461x_dsp.h2
-rw-r--r--sys/dev/sound/pci/csa.c2
-rw-r--r--sys/dev/sound/pci/csamidi.c2
-rw-r--r--sys/dev/sound/pci/csapcm.c2
-rw-r--r--sys/dev/sound/pci/csareg.h2
-rw-r--r--sys/dev/sound/pci/csavar.h2
-rw-r--r--sys/dev/sound/pci/ds1.c2
-rw-r--r--sys/dev/sound/pci/emu10k1.c2
-rw-r--r--sys/dev/sound/pci/emu10kx-midi.c2
-rw-r--r--sys/dev/sound/pci/emu10kx-pcm.c2
-rw-r--r--sys/dev/sound/pci/emu10kx.c2
-rw-r--r--sys/dev/sound/pci/emu10kx.h2
-rw-r--r--sys/dev/sound/pci/envy24.c2
-rw-r--r--sys/dev/sound/pci/envy24.h2
-rw-r--r--sys/dev/sound/pci/envy24ht.c2
-rw-r--r--sys/dev/sound/pci/envy24ht.h2
-rw-r--r--sys/dev/sound/pci/es137x.c2
-rw-r--r--sys/dev/sound/pci/es137x.h2
-rw-r--r--sys/dev/sound/pci/fm801.c2
-rw-r--r--sys/dev/sound/pci/hda/hda_reg.h2
-rw-r--r--sys/dev/sound/pci/hda/hdaa.c2
-rw-r--r--sys/dev/sound/pci/hda/hdaa.h2
-rw-r--r--sys/dev/sound/pci/hda/hdaa_patches.c2
-rw-r--r--sys/dev/sound/pci/hda/hdac.c2
-rw-r--r--sys/dev/sound/pci/hda/hdac.h2
-rw-r--r--sys/dev/sound/pci/hda/hdac_private.h2
-rw-r--r--sys/dev/sound/pci/hda/hdac_reg.h2
-rw-r--r--sys/dev/sound/pci/hda/hdacc.c2
-rw-r--r--sys/dev/sound/pci/hda/pin_patch.h2
-rw-r--r--sys/dev/sound/pci/hda/pin_patch_realtek.h2
-rw-r--r--sys/dev/sound/pci/hdspe-pcm.c2
-rw-r--r--sys/dev/sound/pci/hdspe.c2
-rw-r--r--sys/dev/sound/pci/hdspe.h2
-rw-r--r--sys/dev/sound/pci/ich.c2
-rw-r--r--sys/dev/sound/pci/ich.h2
-rw-r--r--sys/dev/sound/pci/maestro.c2
-rw-r--r--sys/dev/sound/pci/maestro3.c2
-rw-r--r--sys/dev/sound/pci/maestro_reg.h2
-rw-r--r--sys/dev/sound/pci/neomagic-coeff.h2
-rw-r--r--sys/dev/sound/pci/neomagic.c2
-rw-r--r--sys/dev/sound/pci/neomagic.h2
-rw-r--r--sys/dev/sound/pci/solo.c2
-rw-r--r--sys/dev/sound/pci/spicds.c2
-rw-r--r--sys/dev/sound/pci/spicds.h2
-rw-r--r--sys/dev/sound/pci/t4dwave.c2
-rw-r--r--sys/dev/sound/pci/t4dwave.h2
-rw-r--r--sys/dev/sound/pci/via8233.c2
-rw-r--r--sys/dev/sound/pci/via8233.h2
-rw-r--r--sys/dev/sound/pci/via82c686.c2
-rw-r--r--sys/dev/sound/pci/vibes.c2
-rw-r--r--sys/dev/sound/pci/vibes.h2
-rw-r--r--sys/dev/sound/pcm/ac97.c2
-rw-r--r--sys/dev/sound/pcm/ac97.h2
-rw-r--r--sys/dev/sound/pcm/ac97_patch.c2
-rw-r--r--sys/dev/sound/pcm/ac97_patch.h2
-rw-r--r--sys/dev/sound/pcm/buffer.c2
-rw-r--r--sys/dev/sound/pcm/buffer.h2
-rw-r--r--sys/dev/sound/pcm/channel.c2
-rw-r--r--sys/dev/sound/pcm/channel.h2
-rw-r--r--sys/dev/sound/pcm/dsp.c2
-rw-r--r--sys/dev/sound/pcm/dsp.h2
-rw-r--r--sys/dev/sound/pcm/feeder.c2
-rw-r--r--sys/dev/sound/pcm/feeder.h2
-rw-r--r--sys/dev/sound/pcm/feeder_chain.c2
-rw-r--r--sys/dev/sound/pcm/feeder_eq.c2
-rw-r--r--sys/dev/sound/pcm/feeder_format.c2
-rw-r--r--sys/dev/sound/pcm/feeder_matrix.c2
-rw-r--r--sys/dev/sound/pcm/feeder_mixer.c2
-rw-r--r--sys/dev/sound/pcm/feeder_rate.c2
-rw-r--r--sys/dev/sound/pcm/feeder_volume.c2
-rw-r--r--sys/dev/sound/pcm/g711.h2
-rw-r--r--sys/dev/sound/pcm/intpcm.h2
-rw-r--r--sys/dev/sound/pcm/matrix.h2
-rw-r--r--sys/dev/sound/pcm/matrix_map.h2
-rw-r--r--sys/dev/sound/pcm/mixer.c2
-rw-r--r--sys/dev/sound/pcm/mixer.h2
-rw-r--r--sys/dev/sound/pcm/pcm.h2
-rw-r--r--sys/dev/sound/pcm/sndstat.c2
-rw-r--r--sys/dev/sound/pcm/sndstat.h2
-rw-r--r--sys/dev/sound/pcm/sound.c2
-rw-r--r--sys/dev/sound/pcm/sound.h2
-rw-r--r--sys/dev/sound/pcm/vchan.c2
-rw-r--r--sys/dev/sound/pcm/vchan.h2
-rw-r--r--sys/dev/sound/unit.c2
-rw-r--r--sys/dev/sound/unit.h2
-rw-r--r--sys/dev/sound/usb/uaudio.h2
-rw-r--r--sys/dev/sound/usb/uaudio_pcm.c2
-rw-r--r--sys/dev/sound/version.h2
-rw-r--r--sys/dev/spibus/ofw_spibus.c2
-rw-r--r--sys/dev/sume/adapter.h2
-rw-r--r--sys/dev/sume/if_sume.c2
-rw-r--r--sys/dev/syscons/daemon/daemon_saver.c2
-rw-r--r--sys/dev/syscons/fire/fire_saver.c2
-rw-r--r--sys/dev/syscons/scgfbrndr.c2
-rw-r--r--sys/dev/syscons/scmouse.c2
-rw-r--r--sys/dev/syscons/scterm-teken.c2
-rw-r--r--sys/dev/syscons/scterm.c2
-rw-r--r--sys/dev/syscons/scvesactl.c2
-rw-r--r--sys/dev/syscons/scvgarndr.c2
-rw-r--r--sys/dev/syscons/scvidctl.c2
-rw-r--r--sys/dev/syscons/scvtb.c2
-rw-r--r--sys/dev/syscons/sysmouse.c2
-rw-r--r--sys/dev/tcp_log/tcp_log_dev.c2
-rw-r--r--sys/dev/tcp_log/tcp_log_dev.h2
-rw-r--r--sys/dev/tdfx/tdfx_linux.c2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led.c2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led.h2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led_fdt.c2
-rw-r--r--sys/dev/terasic/de4led/terasic_de4led_nexus.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl.h2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_fdt.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_nexus.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_pixel.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_reg.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_syscons.c2
-rw-r--r--sys/dev/terasic/mtl/terasic_mtl_text.c2
-rw-r--r--sys/dev/tsec/if_tsec.c2
-rw-r--r--sys/dev/tsec/if_tsec.h2
-rw-r--r--sys/dev/tsec/if_tsec_fdt.c2
-rw-r--r--sys/dev/tsec/if_tsecreg.h2
-rw-r--r--sys/dev/twa/tw_cl.h2
-rw-r--r--sys/dev/twa/tw_cl_externs.h2
-rw-r--r--sys/dev/twa/tw_cl_fwif.h2
-rw-r--r--sys/dev/twa/tw_cl_init.c2
-rw-r--r--sys/dev/twa/tw_cl_intr.c2
-rw-r--r--sys/dev/twa/tw_cl_io.c2
-rw-r--r--sys/dev/twa/tw_cl_ioctl.h2
-rw-r--r--sys/dev/twa/tw_cl_misc.c2
-rw-r--r--sys/dev/twa/tw_cl_share.h2
-rw-r--r--sys/dev/twa/tw_osl.h2
-rw-r--r--sys/dev/twa/tw_osl_cam.c2
-rw-r--r--sys/dev/twa/tw_osl_externs.h2
-rw-r--r--sys/dev/twa/tw_osl_freebsd.c2
-rw-r--r--sys/dev/twa/tw_osl_includes.h2
-rw-r--r--sys/dev/twa/tw_osl_inline.h2
-rw-r--r--sys/dev/twa/tw_osl_ioctl.h2
-rw-r--r--sys/dev/twa/tw_osl_share.h2
-rw-r--r--sys/dev/twa/tw_osl_types.h2
-rw-r--r--sys/dev/twe/twe.c2
-rw-r--r--sys/dev/twe/twe_compat.h2
-rw-r--r--sys/dev/twe/twe_freebsd.c2
-rw-r--r--sys/dev/twe/twe_tables.h2
-rw-r--r--sys/dev/twe/tweio.h2
-rw-r--r--sys/dev/twe/twereg.h2
-rw-r--r--sys/dev/twe/twevar.h2
-rw-r--r--sys/dev/tws/tws_cam.c2
-rw-r--r--sys/dev/uart/uart.h2
-rw-r--r--sys/dev/uart/uart_bus.h2
-rw-r--r--sys/dev/uart/uart_bus_acpi.c2
-rw-r--r--sys/dev/uart/uart_bus_fdt.c2
-rw-r--r--sys/dev/uart/uart_bus_isa.c2
-rw-r--r--sys/dev/uart/uart_bus_pci.c2
-rw-r--r--sys/dev/uart/uart_bus_puc.c2
-rw-r--r--sys/dev/uart/uart_bus_scc.c2
-rw-r--r--sys/dev/uart/uart_core.c2
-rw-r--r--sys/dev/uart/uart_cpu.h2
-rw-r--r--sys/dev/uart/uart_cpu_acpi.c2
-rw-r--r--sys/dev/uart/uart_cpu_fdt.c2
-rw-r--r--sys/dev/uart/uart_cpu_powerpc.c2
-rw-r--r--sys/dev/uart/uart_cpu_x86.c2
-rw-r--r--sys/dev/uart/uart_dbg.c2
-rw-r--r--sys/dev/uart/uart_dev_imx.c2
-rw-r--r--sys/dev/uart/uart_dev_ns8250.c2
-rw-r--r--sys/dev/uart/uart_dev_ns8250.h2
-rw-r--r--sys/dev/uart/uart_dev_pl011.c2
-rw-r--r--sys/dev/uart/uart_dev_quicc.c2
-rw-r--r--sys/dev/uart/uart_dev_ti8250.c2
-rw-r--r--sys/dev/uart/uart_dev_z8530.c2
-rw-r--r--sys/dev/uart/uart_subr.c2
-rw-r--r--sys/dev/uart/uart_tty.c2
-rw-r--r--sys/dev/usb/controller/atmegadci.c2
-rw-r--r--sys/dev/usb/controller/atmegadci.h2
-rw-r--r--sys/dev/usb/controller/avr32dci.c2
-rw-r--r--sys/dev/usb/controller/avr32dci.h2
-rw-r--r--sys/dev/usb/controller/dwc3.c2
-rw-r--r--sys/dev/usb/controller/dwc3.h2
-rw-r--r--sys/dev/usb/controller/dwc_otg.c2
-rw-r--r--sys/dev/usb/controller/dwc_otg.h2
-rw-r--r--sys/dev/usb/controller/dwc_otg_acpi.c2
-rw-r--r--sys/dev/usb/controller/dwc_otg_fdt.c2
-rw-r--r--sys/dev/usb/controller/dwc_otgreg.h2
-rw-r--r--sys/dev/usb/controller/ehci.c2
-rw-r--r--sys/dev/usb/controller/ehci_fsl.c2
-rw-r--r--sys/dev/usb/controller/ehci_imx.c2
-rw-r--r--sys/dev/usb/controller/ehci_msm.c2
-rw-r--r--sys/dev/usb/controller/generic_xhci.c2
-rw-r--r--sys/dev/usb/controller/generic_xhci.h2
-rw-r--r--sys/dev/usb/controller/generic_xhci_acpi.c2
-rw-r--r--sys/dev/usb/controller/generic_xhci_fdt.c2
-rw-r--r--sys/dev/usb/controller/musb_otg.c2
-rw-r--r--sys/dev/usb/controller/musb_otg.h2
-rw-r--r--sys/dev/usb/controller/ohci.c2
-rw-r--r--sys/dev/usb/controller/ohcireg.h2
-rw-r--r--sys/dev/usb/controller/uhci.c2
-rw-r--r--sys/dev/usb/controller/uhci.h2
-rw-r--r--sys/dev/usb/controller/uhci_pci.c2
-rw-r--r--sys/dev/usb/controller/uhcireg.h2
-rw-r--r--sys/dev/usb/controller/usb_controller.c2
-rw-r--r--sys/dev/usb/controller/usb_nop_xceiv.c2
-rw-r--r--sys/dev/usb/controller/uss820dci.c2
-rw-r--r--sys/dev/usb/controller/uss820dci.h2
-rw-r--r--sys/dev/usb/controller/xhci.c2
-rw-r--r--sys/dev/usb/controller/xhci.h2
-rw-r--r--sys/dev/usb/controller/xhci_pci.c2
-rw-r--r--sys/dev/usb/controller/xhcireg.h2
-rw-r--r--sys/dev/usb/gadget/g_audio.c2
-rw-r--r--sys/dev/usb/gadget/g_audio.h2
-rw-r--r--sys/dev/usb/gadget/g_keyboard.c2
-rw-r--r--sys/dev/usb/gadget/g_keyboard.h2
-rw-r--r--sys/dev/usb/gadget/g_modem.c2
-rw-r--r--sys/dev/usb/gadget/g_modem.h2
-rw-r--r--sys/dev/usb/gadget/g_mouse.c2
-rw-r--r--sys/dev/usb/gadget/g_mouse.h2
-rw-r--r--sys/dev/usb/input/atp.c2
-rw-r--r--sys/dev/usb/input/uep.c2
-rw-r--r--sys/dev/usb/input/uhid_snes.c2
-rw-r--r--sys/dev/usb/input/ums.c2
-rw-r--r--sys/dev/usb/input/usb_rdesc.h2
-rw-r--r--sys/dev/usb/input/wsp.c2
-rw-r--r--sys/dev/usb/net/if_axge.c2
-rw-r--r--sys/dev/usb/net/if_axgereg.h2
-rw-r--r--sys/dev/usb/net/if_cdceem.c2
-rw-r--r--sys/dev/usb/net/if_ipheth.c2
-rw-r--r--sys/dev/usb/net/if_iphethvar.h2
-rw-r--r--sys/dev/usb/net/if_muge.c2
-rw-r--r--sys/dev/usb/net/if_mugereg.h2
-rw-r--r--sys/dev/usb/net/if_rue.c2
-rw-r--r--sys/dev/usb/net/if_ruereg.h2
-rw-r--r--sys/dev/usb/net/if_smsc.c2
-rw-r--r--sys/dev/usb/net/if_smscreg.h2
-rw-r--r--sys/dev/usb/net/if_usie.c2
-rw-r--r--sys/dev/usb/net/if_usievar.h2
-rw-r--r--sys/dev/usb/net/ruephy.c2
-rw-r--r--sys/dev/usb/net/ruephyreg.h2
-rw-r--r--sys/dev/usb/net/uhso.c2
-rw-r--r--sys/dev/usb/net/usb_ethernet.c2
-rw-r--r--sys/dev/usb/net/usb_ethernet.h2
-rw-r--r--sys/dev/usb/quirk/usb_quirk.h2
-rw-r--r--sys/dev/usb/serial/ubsa.c2
-rw-r--r--sys/dev/usb/serial/ubser.c2
-rw-r--r--sys/dev/usb/serial/uchcom.c2
-rw-r--r--sys/dev/usb/serial/ucycom.c2
-rw-r--r--sys/dev/usb/serial/ufoma.c2
-rw-r--r--sys/dev/usb/serial/umcs.c2
-rw-r--r--sys/dev/usb/serial/umcs.h2
-rw-r--r--sys/dev/usb/serial/umct.c2
-rw-r--r--sys/dev/usb/serial/umodem.c2
-rw-r--r--sys/dev/usb/serial/uplcom.c2
-rw-r--r--sys/dev/usb/serial/usb_serial.c2
-rw-r--r--sys/dev/usb/serial/usb_serial.h2
-rw-r--r--sys/dev/usb/serial/uvscom.c2
-rw-r--r--sys/dev/usb/storage/cfumass.c2
-rw-r--r--sys/dev/usb/storage/umass.c2
-rw-r--r--sys/dev/usb/storage/urio.c2
-rw-r--r--sys/dev/usb/template/usb_template.c2
-rw-r--r--sys/dev/usb/template/usb_template.h2
-rw-r--r--sys/dev/usb/template/usb_template_audio.c2
-rw-r--r--sys/dev/usb/template/usb_template_cdce.c2
-rw-r--r--sys/dev/usb/template/usb_template_cdceem.c2
-rw-r--r--sys/dev/usb/template/usb_template_kbd.c2
-rw-r--r--sys/dev/usb/template/usb_template_midi.c2
-rw-r--r--sys/dev/usb/template/usb_template_modem.c2
-rw-r--r--sys/dev/usb/template/usb_template_mouse.c2
-rw-r--r--sys/dev/usb/template/usb_template_msc.c2
-rw-r--r--sys/dev/usb/template/usb_template_mtp.c2
-rw-r--r--sys/dev/usb/template/usb_template_multi.c2
-rw-r--r--sys/dev/usb/template/usb_template_phone.c2
-rw-r--r--sys/dev/usb/template/usb_template_serialnet.c2
-rw-r--r--sys/dev/usb/ufm_ioctl.h2
-rw-r--r--sys/dev/usb/usb_bus.h2
-rw-r--r--sys/dev/usb/usb_busdma.c2
-rw-r--r--sys/dev/usb/usb_busdma.h2
-rw-r--r--sys/dev/usb/usb_controller.h2
-rw-r--r--sys/dev/usb/usb_core.c2
-rw-r--r--sys/dev/usb/usb_core.h2
-rw-r--r--sys/dev/usb/usb_debug.c2
-rw-r--r--sys/dev/usb/usb_debug.h2
-rw-r--r--sys/dev/usb/usb_dev.c2
-rw-r--r--sys/dev/usb/usb_dev.h2
-rw-r--r--sys/dev/usb/usb_device.c2
-rw-r--r--sys/dev/usb/usb_device.h2
-rw-r--r--sys/dev/usb/usb_dynamic.c2
-rw-r--r--sys/dev/usb/usb_dynamic.h2
-rw-r--r--sys/dev/usb/usb_endian.h2
-rw-r--r--sys/dev/usb/usb_error.c2
-rw-r--r--sys/dev/usb/usb_freebsd.h2
-rw-r--r--sys/dev/usb/usb_freebsd_loader.h2
-rw-r--r--sys/dev/usb/usb_generic.c2
-rw-r--r--sys/dev/usb/usb_generic.h2
-rw-r--r--sys/dev/usb/usb_handle_request.c2
-rw-r--r--sys/dev/usb/usb_hub.h2
-rw-r--r--sys/dev/usb/usb_ioctl.h2
-rw-r--r--sys/dev/usb/usb_lookup.c2
-rw-r--r--sys/dev/usb/usb_mbuf.c2
-rw-r--r--sys/dev/usb/usb_mbuf.h2
-rw-r--r--sys/dev/usb/usb_msctest.c2
-rw-r--r--sys/dev/usb/usb_msctest.h2
-rw-r--r--sys/dev/usb/usb_parse.c2
-rw-r--r--sys/dev/usb/usb_pci.h2
-rw-r--r--sys/dev/usb/usb_process.c2
-rw-r--r--sys/dev/usb/usb_process.h2
-rw-r--r--sys/dev/usb/usb_request.c2
-rw-r--r--sys/dev/usb/usb_request.h2
-rw-r--r--sys/dev/usb/usb_transfer.c2
-rw-r--r--sys/dev/usb/usb_transfer.h2
-rw-r--r--sys/dev/usb/usb_util.c2
-rw-r--r--sys/dev/usb/usb_util.h2
-rw-r--r--sys/dev/usb/usbdi.h2
-rw-r--r--sys/dev/usb/usbdi_util.h2
-rw-r--r--sys/dev/usb/wlan/if_uath.c2
-rw-r--r--sys/dev/viawd/viawd.c2
-rw-r--r--sys/dev/viawd/viawd.h2
-rw-r--r--sys/dev/virtio/balloon/virtio_balloon.c2
-rw-r--r--sys/dev/virtio/block/virtio_blk.c2
-rw-r--r--sys/dev/virtio/network/if_vtnet.c2
-rw-r--r--sys/dev/virtio/network/if_vtnetvar.h2
-rw-r--r--sys/dev/virtio/pci/virtio_pci.c2
-rw-r--r--sys/dev/virtio/pci/virtio_pci.h2
-rw-r--r--sys/dev/virtio/pci/virtio_pci_legacy.c2
-rw-r--r--sys/dev/virtio/pci/virtio_pci_modern.c2
-rw-r--r--sys/dev/virtio/random/virtio_random.c2
-rw-r--r--sys/dev/virtio/scsi/virtio_scsi.c2
-rw-r--r--sys/dev/virtio/scsi/virtio_scsi.h2
-rw-r--r--sys/dev/virtio/scsi/virtio_scsivar.h2
-rw-r--r--sys/dev/virtio/virtio.c2
-rw-r--r--sys/dev/virtio/virtqueue.c2
-rw-r--r--sys/dev/virtio/virtqueue.h2
-rw-r--r--sys/dev/vkbd/vkbd.c2
-rw-r--r--sys/dev/vkbd/vkbd_var.h2
-rw-r--r--sys/dev/vmgenc/vmgenc_acpi.c2
-rw-r--r--sys/dev/vmgenc/vmgenc_acpi.h2
-rw-r--r--sys/dev/vt/colors/vt_termcolors.c2
-rw-r--r--sys/dev/vt/colors/vt_termcolors.h2
-rw-r--r--sys/dev/vt/font/vt_font_default.c2
-rw-r--r--sys/dev/vt/font/vt_mouse_cursor.c2
-rw-r--r--sys/dev/vt/hw/efifb/efifb.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_early_fb.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_fb.c2
-rw-r--r--sys/dev/vt/hw/fb/vt_fb.h2
-rw-r--r--sys/dev/vt/hw/ofwfb/ofwfb.c2
-rw-r--r--sys/dev/vt/hw/vbefb/vbefb.c2
-rw-r--r--sys/dev/vt/logo/logo_freebsd.c2
-rw-r--r--sys/dev/vt/vt.h2
-rw-r--r--sys/dev/vt/vt_buf.c2
-rw-r--r--sys/dev/vt/vt_consolectl.c2
-rw-r--r--sys/dev/vt/vt_core.c2
-rw-r--r--sys/dev/vt/vt_font.c2
-rw-r--r--sys/dev/vt/vt_sysmouse.c2
-rw-r--r--sys/dev/vte/if_vte.c2
-rw-r--r--sys/dev/vte/if_vtereg.h2
-rw-r--r--sys/dev/vte/if_vtevar.h2
-rw-r--r--sys/dev/watchdog/watchdog.c2
-rw-r--r--sys/dev/wbwd/wbwd.c2
-rw-r--r--sys/dev/wtap/if_medium.c2
-rw-r--r--sys/dev/wtap/if_medium.h2
-rw-r--r--sys/dev/wtap/if_wtap.c2
-rw-r--r--sys/dev/wtap/if_wtap_module.c2
-rw-r--r--sys/dev/wtap/if_wtapioctl.h2
-rw-r--r--sys/dev/wtap/if_wtapvar.h2
-rw-r--r--sys/dev/wtap/plugins/visibility.c2
-rw-r--r--sys/dev/wtap/plugins/visibility.h2
-rw-r--r--sys/dev/wtap/plugins/visibility_ioctl.h2
-rw-r--r--sys/dev/wtap/plugins/wtap_plugin.h2
-rw-r--r--sys/dev/wtap/wtap_hal/hal.c2
-rw-r--r--sys/dev/wtap/wtap_hal/hal.h2
-rw-r--r--sys/dev/wtap/wtap_hal/handler.h2
-rw-r--r--sys/dev/xen/blkback/blkback.c2
-rw-r--r--sys/dev/xen/control/control.c2
-rw-r--r--sys/dev/xen/netback/netback.c2
-rw-r--r--sys/dev/xen/netback/netback_unit_tests.c2
-rw-r--r--sys/dev/xen/netfront/netfront.c2
-rw-r--r--sys/dev/xen/timer/timer.c2
-rw-r--r--sys/dev/xen/timer/timer.h2
-rw-r--r--sys/dev/xen/xenpci/xenpci.c2
-rw-r--r--sys/dev/xen/xenpci/xenpcivar.h2
-rw-r--r--sys/fs/autofs/autofs.h2
-rw-r--r--sys/fs/autofs/autofs_ioctl.h2
-rw-r--r--sys/fs/autofs/autofs_vfsops.c2
-rw-r--r--sys/fs/autofs/autofs_vnops.c2
-rw-r--r--sys/fs/cd9660/cd9660_iconv.c2
-rw-r--r--sys/fs/devfs/devfs.h2
-rw-r--r--sys/fs/devfs/devfs_devs.c2
-rw-r--r--sys/fs/devfs/devfs_dir.c2
-rw-r--r--sys/fs/devfs/devfs_int.h2
-rw-r--r--sys/fs/devfs/devfs_rule.c2
-rw-r--r--sys/fs/devfs/devfs_vfsops.c2
-rw-r--r--sys/fs/devfs/devfs_vnops.c2
-rw-r--r--sys/fs/ext2fs/ext2_acl.c2
-rw-r--r--sys/fs/ext2fs/ext2_acl.h2
-rw-r--r--sys/fs/ext2fs/ext2_csum.c2
-rw-r--r--sys/fs/ext2fs/ext2_dinode.h2
-rw-r--r--sys/fs/ext2fs/ext2_dir.h2
-rw-r--r--sys/fs/ext2fs/ext2_extattr.c2
-rw-r--r--sys/fs/ext2fs/ext2_extattr.h2
-rw-r--r--sys/fs/ext2fs/ext2_extents.c2
-rw-r--r--sys/fs/ext2fs/ext2_extents.h2
-rw-r--r--sys/fs/ext2fs/ext2_hash.c2
-rw-r--r--sys/fs/ext2fs/ext2_htree.c2
-rw-r--r--sys/fs/ext2fs/ext2fs.h2
-rw-r--r--sys/fs/ext2fs/htree.h2
-rw-r--r--sys/fs/mntfs/mntfs_vnops.c2
-rw-r--r--sys/fs/msdosfs/msdosfs_iconv.c2
-rw-r--r--sys/fs/nfs/nfs_commonacl.c2
-rw-r--r--sys/fs/nfs/nfscl.h2
-rw-r--r--sys/fs/nfs/nfsclstate.h2
-rw-r--r--sys/fs/nfs/nfsdport.h2
-rw-r--r--sys/fs/nfs/nfskpiport.h2
-rw-r--r--sys/fs/nfs/nfsrvstate.h2
-rw-r--r--sys/fs/nfs/nfsv4_errstr.h2
-rw-r--r--sys/fs/nfsclient/nfs_clkdtrace.c2
-rw-r--r--sys/fs/nfsclient/nfs_clstate.c2
-rw-r--r--sys/fs/nfsclient/nfs_kdtrace.h2
-rw-r--r--sys/fs/nfsserver/nfs_fha_new.c2
-rw-r--r--sys/fs/nfsserver/nfs_fha_new.h2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdstate.c2
-rw-r--r--sys/fs/smbfs/smbfs.h2
-rw-r--r--sys/fs/smbfs/smbfs_io.c2
-rw-r--r--sys/fs/smbfs/smbfs_node.c2
-rw-r--r--sys/fs/smbfs/smbfs_node.h2
-rw-r--r--sys/fs/smbfs/smbfs_smb.c2
-rw-r--r--sys/fs/smbfs/smbfs_subr.c2
-rw-r--r--sys/fs/smbfs/smbfs_subr.h2
-rw-r--r--sys/fs/smbfs/smbfs_vfsops.c2
-rw-r--r--sys/fs/smbfs/smbfs_vnops.c2
-rw-r--r--sys/fs/udf/ecma167-udf.h2
-rw-r--r--sys/fs/udf/udf.h2
-rw-r--r--sys/fs/udf/udf_iconv.c2
-rw-r--r--sys/fs/udf/udf_mount.h2
-rw-r--r--sys/fs/udf/udf_vfsops.c2
-rw-r--r--sys/fs/udf/udf_vnops.c2
-rw-r--r--sys/gdb/gdb.h2
-rw-r--r--sys/gdb/gdb_cons.c2
-rw-r--r--sys/gdb/gdb_int.h2
-rw-r--r--sys/gdb/gdb_main.c2
-rw-r--r--sys/gdb/gdb_packet.c2
-rw-r--r--sys/gdb/netgdb.c2
-rw-r--r--sys/gdb/netgdb.h2
-rw-r--r--sys/geom/bde/g_bde.c2
-rw-r--r--sys/geom/bde/g_bde.h2
-rw-r--r--sys/geom/bde/g_bde_crypt.c2
-rw-r--r--sys/geom/bde/g_bde_lock.c2
-rw-r--r--sys/geom/bde/g_bde_work.c2
-rw-r--r--sys/geom/cache/g_cache.c2
-rw-r--r--sys/geom/cache/g_cache.h2
-rw-r--r--sys/geom/concat/g_concat.c2
-rw-r--r--sys/geom/concat/g_concat.h2
-rw-r--r--sys/geom/eli/g_eli.c2
-rw-r--r--sys/geom/eli/g_eli.h2
-rw-r--r--sys/geom/eli/g_eli_crypto.c2
-rw-r--r--sys/geom/eli/g_eli_ctl.c2
-rw-r--r--sys/geom/eli/g_eli_integrity.c2
-rw-r--r--sys/geom/eli/g_eli_key.c2
-rw-r--r--sys/geom/eli/g_eli_key_cache.c2
-rw-r--r--sys/geom/eli/g_eli_privacy.c2
-rw-r--r--sys/geom/eli/pkcs5v2.c2
-rw-r--r--sys/geom/eli/pkcs5v2.h2
-rw-r--r--sys/geom/gate/g_gate.c2
-rw-r--r--sys/geom/gate/g_gate.h2
-rw-r--r--sys/geom/geom_dbg.h2
-rw-r--r--sys/geom/geom_flashmap.c2
-rw-r--r--sys/geom/geom_map.c2
-rw-r--r--sys/geom/geom_redboot.c2
-rw-r--r--sys/geom/geom_vfs.c2
-rw-r--r--sys/geom/geom_vfs.h2
-rw-r--r--sys/geom/journal/g_journal.c2
-rw-r--r--sys/geom/journal/g_journal.h2
-rw-r--r--sys/geom/journal/g_journal_ufs.c2
-rw-r--r--sys/geom/label/g_label.c2
-rw-r--r--sys/geom/label/g_label.h2
-rw-r--r--sys/geom/label/g_label_disk_ident.c2
-rw-r--r--sys/geom/label/g_label_ext2fs.c2
-rw-r--r--sys/geom/label/g_label_flashmap.c2
-rw-r--r--sys/geom/label/g_label_gpt.c2
-rw-r--r--sys/geom/label/g_label_iso9660.c2
-rw-r--r--sys/geom/label/g_label_msdosfs.c2
-rw-r--r--sys/geom/label/g_label_msdosfs.h2
-rw-r--r--sys/geom/label/g_label_ntfs.c2
-rw-r--r--sys/geom/label/g_label_reiserfs.c2
-rw-r--r--sys/geom/label/g_label_ufs.c2
-rw-r--r--sys/geom/linux_lvm/g_linux_lvm.c2
-rw-r--r--sys/geom/linux_lvm/g_linux_lvm.h2
-rw-r--r--sys/geom/mirror/g_mirror.c2
-rw-r--r--sys/geom/mirror/g_mirror.h2
-rw-r--r--sys/geom/mirror/g_mirror_ctl.c2
-rw-r--r--sys/geom/mountver/g_mountver.c2
-rw-r--r--sys/geom/mountver/g_mountver.h2
-rw-r--r--sys/geom/multipath/g_multipath.c2
-rw-r--r--sys/geom/multipath/g_multipath.h2
-rw-r--r--sys/geom/nop/g_nop.c2
-rw-r--r--sys/geom/nop/g_nop.h2
-rw-r--r--sys/geom/part/g_part.c2
-rw-r--r--sys/geom/part/g_part.h2
-rw-r--r--sys/geom/part/g_part_apm.c2
-rw-r--r--sys/geom/part/g_part_bsd.c2
-rw-r--r--sys/geom/part/g_part_ebr.c2
-rw-r--r--sys/geom/part/g_part_gpt.c2
-rw-r--r--sys/geom/part/g_part_ldm.c2
-rw-r--r--sys/geom/part/g_part_mbr.c2
-rw-r--r--sys/geom/part/g_part_vtoc8.c2
-rw-r--r--sys/geom/raid/g_raid.c2
-rw-r--r--sys/geom/raid/g_raid.h2
-rw-r--r--sys/geom/raid/g_raid_ctl.c2
-rw-r--r--sys/geom/raid/md_ddf.c2
-rw-r--r--sys/geom/raid/md_ddf.h2
-rw-r--r--sys/geom/raid/md_intel.c2
-rw-r--r--sys/geom/raid/md_jmicron.c2
-rw-r--r--sys/geom/raid/md_nvidia.c2
-rw-r--r--sys/geom/raid/md_promise.c2
-rw-r--r--sys/geom/raid/md_sii.c2
-rw-r--r--sys/geom/raid/tr_concat.c2
-rw-r--r--sys/geom/raid/tr_raid0.c2
-rw-r--r--sys/geom/raid/tr_raid1.c2
-rw-r--r--sys/geom/raid/tr_raid1e.c2
-rw-r--r--sys/geom/raid/tr_raid5.c2
-rw-r--r--sys/geom/raid3/g_raid3.c2
-rw-r--r--sys/geom/raid3/g_raid3.h2
-rw-r--r--sys/geom/raid3/g_raid3_ctl.c2
-rw-r--r--sys/geom/shsec/g_shsec.c2
-rw-r--r--sys/geom/shsec/g_shsec.h2
-rw-r--r--sys/geom/stripe/g_stripe.c2
-rw-r--r--sys/geom/stripe/g_stripe.h2
-rw-r--r--sys/geom/uzip/g_uzip.c2
-rw-r--r--sys/geom/uzip/g_uzip_zstd.c2
-rw-r--r--sys/geom/uzip/g_uzip_zstd.h2
-rw-r--r--sys/geom/vinum/geom_vinum.c2
-rw-r--r--sys/geom/vinum/geom_vinum.h2
-rw-r--r--sys/geom/vinum/geom_vinum_create.c2
-rw-r--r--sys/geom/vinum/geom_vinum_drive.c2
-rw-r--r--sys/geom/vinum/geom_vinum_events.c2
-rw-r--r--sys/geom/vinum/geom_vinum_init.c2
-rw-r--r--sys/geom/vinum/geom_vinum_list.c2
-rw-r--r--sys/geom/vinum/geom_vinum_move.c2
-rw-r--r--sys/geom/vinum/geom_vinum_plex.c2
-rw-r--r--sys/geom/vinum/geom_vinum_raid5.c2
-rw-r--r--sys/geom/vinum/geom_vinum_raid5.h2
-rw-r--r--sys/geom/vinum/geom_vinum_rename.c2
-rw-r--r--sys/geom/vinum/geom_vinum_rm.c2
-rw-r--r--sys/geom/vinum/geom_vinum_share.h2
-rw-r--r--sys/geom/vinum/geom_vinum_state.c2
-rw-r--r--sys/geom/vinum/geom_vinum_volume.c2
-rw-r--r--sys/geom/virstor/binstream.c2
-rw-r--r--sys/geom/virstor/binstream.h2
-rw-r--r--sys/geom/virstor/g_virstor.c2
-rw-r--r--sys/geom/virstor/g_virstor.h2
-rw-r--r--sys/geom/virstor/g_virstor_md.c2
-rw-r--r--sys/geom/virstor/g_virstor_md.h2
-rw-r--r--sys/geom/zero/g_zero.c2
-rw-r--r--sys/gnu/gcov/gcov.h2
-rw-r--r--sys/gnu/gcov/gcov_subr.c2
-rw-r--r--sys/i386/acpica/acpi_machdep.c2
-rw-r--r--sys/i386/acpica/acpi_wakeup.c2
-rw-r--r--sys/i386/bios/smapi.c2
-rw-r--r--sys/i386/i386/bios.c2
-rw-r--r--sys/i386/i386/copyout.c2
-rw-r--r--sys/i386/i386/copyout_fast.s2
-rw-r--r--sys/i386/i386/elf_machdep.c2
-rw-r--r--sys/i386/i386/gdb_machdep.c2
-rw-r--r--sys/i386/i386/geode.c2
-rw-r--r--sys/i386/i386/initcpu.c2
-rw-r--r--sys/i386/i386/io.c2
-rw-r--r--sys/i386/i386/k6_mem.c2
-rw-r--r--sys/i386/i386/minidump_machdep.c2
-rw-r--r--sys/i386/i386/minidump_machdep_base.c2
-rw-r--r--sys/i386/i386/minidump_machdep_nopae.c2
-rw-r--r--sys/i386/i386/minidump_machdep_pae.c2
-rw-r--r--sys/i386/i386/mp_machdep.c2
-rw-r--r--sys/i386/i386/pmap_nopae.c2
-rw-r--r--sys/i386/i386/pmap_pae.c2
-rw-r--r--sys/i386/i386/prof_machdep.c2
-rw-r--r--sys/i386/i386/ptrace_machdep.c2
-rw-r--r--sys/i386/i386/vm86.c2
-rw-r--r--sys/i386/include/_bus.h2
-rw-r--r--sys/i386/include/atomic.h2
-rw-r--r--sys/i386/include/bus_dma.h2
-rw-r--r--sys/i386/include/counter.h2
-rw-r--r--sys/i386/include/elan_mmcr.h2
-rw-r--r--sys/i386/include/gdb_machdep.h2
-rw-r--r--sys/i386/include/iodev.h2
-rw-r--r--sys/i386/include/kdb.h2
-rw-r--r--sys/i386/include/memdev.h2
-rw-r--r--sys/i386/include/minidump.h2
-rw-r--r--sys/i386/include/mp_watchdog.h2
-rw-r--r--sys/i386/include/pc/bios.h2
-rw-r--r--sys/i386/include/pcb_ext.h2
-rw-r--r--sys/i386/include/pcpu.h2
-rw-r--r--sys/i386/include/pcpu_aux.h2
-rw-r--r--sys/i386/include/pmap_base.h2
-rw-r--r--sys/i386/include/pmc_mdep.h2
-rw-r--r--sys/i386/include/ppireg.h2
-rw-r--r--sys/i386/include/runq.h2
-rw-r--r--sys/i386/include/sf_buf.h2
-rw-r--r--sys/i386/include/smapi.h2
-rw-r--r--sys/i386/include/timerreg.h2
-rw-r--r--sys/i386/include/vm.h2
-rw-r--r--sys/i386/include/vm86.h2
-rw-r--r--sys/i386/linux/imgact_linux.c2
-rw-r--r--sys/i386/linux/linux.h2
-rw-r--r--sys/i386/linux/linux_copyout.c2
-rw-r--r--sys/i386/linux/linux_dummy_machdep.c2
-rw-r--r--sys/i386/linux/linux_machdep.c2
-rw-r--r--sys/i386/linux/linux_ptrace_machdep.c2
-rw-r--r--sys/i386/linux/linux_sysvec.c2
-rw-r--r--sys/i386/linux/linux_vdso_gtod.c2
-rw-r--r--sys/i386/pci/pci_cfgreg.c2
-rw-r--r--sys/i386/pci/pci_pir.c2
-rw-r--r--sys/isa/isa_common.c2
-rw-r--r--sys/isa/isa_common.h2
-rw-r--r--sys/isa/isa_dmareg.h2
-rw-r--r--sys/isa/isahint.c2
-rw-r--r--sys/isa/isavar.h2
-rw-r--r--sys/isa/pnp.c2
-rw-r--r--sys/isa/pnpparse.c2
-rw-r--r--sys/isa/pnpvar.h2
-rw-r--r--sys/isa/syscons_isa.c2
-rw-r--r--sys/isa/vga_isa.c2
-rw-r--r--sys/kern/genoffset.c2
-rw-r--r--sys/kern/genoffset.sh2
-rw-r--r--sys/kern/imgact_aout.c2
-rw-r--r--sys/kern/imgact_elf32.c2
-rw-r--r--sys/kern/imgact_elf64.c2
-rw-r--r--sys/kern/imgact_shell.c2
-rw-r--r--sys/kern/kern_alq.c2
-rw-r--r--sys/kern/kern_clocksource.c2
-rw-r--r--sys/kern/kern_condvar.c2
-rw-r--r--sys/kern/kern_conf.c2
-rw-r--r--sys/kern/kern_context.c2
-rw-r--r--sys/kern/kern_cpu.c2
-rw-r--r--sys/kern/kern_cpuset.c2
-rw-r--r--sys/kern/kern_ctf.c2
-rw-r--r--sys/kern/kern_dtrace.c2
-rw-r--r--sys/kern/kern_environment.c2
-rw-r--r--sys/kern/kern_et.c2
-rw-r--r--sys/kern/kern_event.c2
-rw-r--r--sys/kern/kern_exec.c2
-rw-r--r--sys/kern/kern_fail.c2
-rw-r--r--sys/kern/kern_ffclock.c2
-rw-r--r--sys/kern/kern_hhook.c2
-rw-r--r--sys/kern/kern_idle.c2
-rw-r--r--sys/kern/kern_intr.c2
-rw-r--r--sys/kern/kern_jail.c2
-rw-r--r--sys/kern/kern_kcov.c2
-rw-r--r--sys/kern/kern_khelp.c2
-rw-r--r--sys/kern/kern_kthread.c2
-rw-r--r--sys/kern/kern_ktr.c2
-rw-r--r--sys/kern/kern_linker.c2
-rw-r--r--sys/kern/kern_lock.c2
-rw-r--r--sys/kern/kern_lockstat.c2
-rw-r--r--sys/kern/kern_loginclass.c2
-rw-r--r--sys/kern/kern_mbuf.c2
-rw-r--r--sys/kern/kern_module.c2
-rw-r--r--sys/kern/kern_mtxpool.c2
-rw-r--r--sys/kern/kern_osd.c2
-rw-r--r--sys/kern/kern_pmc.c2
-rw-r--r--sys/kern/kern_poll.c2
-rw-r--r--sys/kern/kern_priv.c2
-rw-r--r--sys/kern/kern_racct.c2
-rw-r--r--sys/kern/kern_rangelock.c2
-rw-r--r--sys/kern/kern_rctl.c2
-rw-r--r--sys/kern/kern_rwlock.c2
-rw-r--r--sys/kern/kern_sdt.c2
-rw-r--r--sys/kern/kern_sema.c2
-rw-r--r--sys/kern/kern_sharedpage.c2
-rw-r--r--sys/kern/kern_switch.c2
-rw-r--r--sys/kern/kern_sx.c2
-rw-r--r--sys/kern/kern_syscalls.c2
-rw-r--r--sys/kern/kern_thr.c2
-rw-r--r--sys/kern/kern_thread.c2
-rw-r--r--sys/kern/kern_umtx.c2
-rw-r--r--sys/kern/kern_uuid.c2
-rw-r--r--sys/kern/link_elf.c2
-rw-r--r--sys/kern/link_elf_obj.c2
-rw-r--r--sys/kern/sched_ule.c2
-rw-r--r--sys/kern/subr_acl_nfs4.c2
-rw-r--r--sys/kern/subr_acl_posix1e.c2
-rw-r--r--sys/kern/subr_atomic64.c2
-rw-r--r--sys/kern/subr_boot.c2
-rw-r--r--sys/kern/subr_bufring.c2
-rw-r--r--sys/kern/subr_bus.c2
-rw-r--r--sys/kern/subr_bus_dma.c2
-rw-r--r--sys/kern/subr_busdma_bufalloc.c2
-rw-r--r--sys/kern/subr_capability.c2
-rw-r--r--sys/kern/subr_compressor.c2
-rw-r--r--sys/kern/subr_counter.c2
-rw-r--r--sys/kern/subr_coverage.c2
-rw-r--r--sys/kern/subr_dummy_vdso_tc.c2
-rw-r--r--sys/kern/subr_epoch.c2
-rw-r--r--sys/kern/subr_eventhandler.c2
-rw-r--r--sys/kern/subr_fattime.c2
-rw-r--r--sys/kern/subr_firmware.c2
-rw-r--r--sys/kern/subr_hints.c2
-rw-r--r--sys/kern/subr_kdb.c2
-rw-r--r--sys/kern/subr_kobj.c2
-rw-r--r--sys/kern/subr_lock.c2
-rw-r--r--sys/kern/subr_module.c2
-rw-r--r--sys/kern/subr_msgbuf.c2
-rw-r--r--sys/kern/subr_pctrie.c2
-rw-r--r--sys/kern/subr_physmem.c2
-rw-r--r--sys/kern/subr_pidctrl.c2
-rw-r--r--sys/kern/subr_power.c2
-rw-r--r--sys/kern/subr_prng.c2
-rw-r--r--sys/kern/subr_rangeset.c2
-rw-r--r--sys/kern/subr_sbuf.c2
-rw-r--r--sys/kern/subr_sleepqueue.c2
-rw-r--r--sys/kern/subr_smp.c2
-rw-r--r--sys/kern/subr_smr.c2
-rw-r--r--sys/kern/subr_stack.c2
-rw-r--r--sys/kern/subr_taskqueue.c2
-rw-r--r--sys/kern/subr_terminal.c2
-rw-r--r--sys/kern/subr_unit.c2
-rw-r--r--sys/kern/subr_vmem.c2
-rw-r--r--sys/kern/sys_capability.c2
-rw-r--r--sys/kern/sys_eventfd.c2
-rw-r--r--sys/kern/sys_getrandom.c2
-rw-r--r--sys/kern/sys_procdesc.c2
-rw-r--r--sys/kern/sysv_msg.c2
-rw-r--r--sys/kern/sysv_sem.c2
-rw-r--r--sys/kern/sysv_shm.c2
-rw-r--r--sys/kern/tty.c2
-rw-r--r--sys/kern/tty_inq.c2
-rw-r--r--sys/kern/tty_outq.c2
-rw-r--r--sys/kern/tty_pts.c2
-rw-r--r--sys/kern/tty_tty.c2
-rw-r--r--sys/kern/tty_ttydisc.c2
-rw-r--r--sys/kern/uipc_accf.c2
-rw-r--r--sys/kern/uipc_debug.c2
-rw-r--r--sys/kern/uipc_mqueue.c2
-rw-r--r--sys/kern/uipc_sem.c2
-rw-r--r--sys/kern/uipc_shm.c2
-rw-r--r--sys/kern/vfs_acl.c2
-rw-r--r--sys/kern/vfs_aio.c2
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/kern/vfs_extattr.c2
-rw-r--r--sys/kern/vfs_hash.c2
-rw-r--r--sys/kgssapi/gss_accept_sec_context.c2
-rw-r--r--sys/kgssapi/gss_acquire_cred.c2
-rw-r--r--sys/kgssapi/gss_add_oid_set_member.c2
-rw-r--r--sys/kgssapi/gss_canonicalize_name.c2
-rw-r--r--sys/kgssapi/gss_create_empty_oid_set.c2
-rw-r--r--sys/kgssapi/gss_delete_sec_context.c2
-rw-r--r--sys/kgssapi/gss_display_status.c2
-rw-r--r--sys/kgssapi/gss_export_name.c2
-rw-r--r--sys/kgssapi/gss_get_mic.c2
-rw-r--r--sys/kgssapi/gss_impl.c2
-rw-r--r--sys/kgssapi/gss_import_name.c2
-rw-r--r--sys/kgssapi/gss_init_sec_context.c2
-rw-r--r--sys/kgssapi/gss_names.c2
-rw-r--r--sys/kgssapi/gss_pname_to_uid.c2
-rw-r--r--sys/kgssapi/gss_release_buffer.c2
-rw-r--r--sys/kgssapi/gss_release_cred.c2
-rw-r--r--sys/kgssapi/gss_release_name.c2
-rw-r--r--sys/kgssapi/gss_release_oid_set.c2
-rw-r--r--sys/kgssapi/gss_set_cred_option.c2
-rw-r--r--sys/kgssapi/gss_test_oid_set_member.c2
-rw-r--r--sys/kgssapi/gss_unwrap.c2
-rw-r--r--sys/kgssapi/gss_verify_mic.c2
-rw-r--r--sys/kgssapi/gss_wrap.c2
-rw-r--r--sys/kgssapi/gss_wrap_size_limit.c2
-rw-r--r--sys/kgssapi/gssapi_impl.h2
-rw-r--r--sys/kgssapi/gssd_prot.c2
-rw-r--r--sys/kgssapi/gsstest.c2
-rw-r--r--sys/kgssapi/krb5/kcrypto.c2
-rw-r--r--sys/kgssapi/krb5/kcrypto.h2
-rw-r--r--sys/kgssapi/krb5/kcrypto_aes.c2
-rw-r--r--sys/kgssapi/krb5/krb5_mech.c2
-rw-r--r--sys/libkern/arm/aeabi_unwind.c2
-rw-r--r--sys/libkern/arm/ldivmod_helper.c2
-rw-r--r--sys/libkern/iconv.c2
-rw-r--r--sys/libkern/iconv_ucs.c2
-rw-r--r--sys/libkern/iconv_xlat.c2
-rw-r--r--sys/libkern/iconv_xlat16.c2
-rw-r--r--sys/libkern/inet_aton.c2
-rw-r--r--sys/libkern/memcchr.c2
-rw-r--r--sys/libkern/memset.c2
-rw-r--r--sys/libkern/strchrnul.c2
-rw-r--r--sys/libkern/strcspn.c2
-rw-r--r--sys/libkern/strdup.c2
-rw-r--r--sys/libkern/strlen.c2
-rw-r--r--sys/libkern/strnlen.c2
-rw-r--r--sys/libkern/strspn.c2
-rw-r--r--sys/libkern/strvalid.c2
-rw-r--r--sys/mips/atheros/apb.c2
-rw-r--r--sys/mips/atheros/apbvar.h2
-rw-r--r--sys/mips/atheros/ar71xx_bus_space_reversed.c2
-rw-r--r--sys/mips/atheros/ar71xx_bus_space_reversed.h2
-rw-r--r--sys/mips/atheros/ar71xx_chip.c2
-rw-r--r--sys/mips/atheros/ar71xx_chip.h2
-rw-r--r--sys/mips/atheros/ar71xx_cpudef.h2
-rw-r--r--sys/mips/atheros/ar71xx_ehci.c2
-rw-r--r--sys/mips/atheros/ar71xx_fixup.c2
-rw-r--r--sys/mips/atheros/ar71xx_fixup.h2
-rw-r--r--sys/mips/atheros/ar71xx_gpio.c2
-rw-r--r--sys/mips/atheros/ar71xx_gpiovar.h2
-rw-r--r--sys/mips/atheros/ar71xx_machdep.c2
-rw-r--r--sys/mips/atheros/ar71xx_ohci.c2
-rw-r--r--sys/mips/atheros/ar71xx_pci.c2
-rw-r--r--sys/mips/atheros/ar71xx_pci_bus_space.c2
-rw-r--r--sys/mips/atheros/ar71xx_pci_bus_space.h2
-rw-r--r--sys/mips/atheros/ar71xx_setup.c2
-rw-r--r--sys/mips/atheros/ar71xx_setup.h2
-rw-r--r--sys/mips/atheros/ar71xx_spi.c2
-rw-r--r--sys/mips/atheros/ar71xx_wdog.c2
-rw-r--r--sys/mips/atheros/ar71xxreg.h2
-rw-r--r--sys/mips/atheros/ar724x_chip.c2
-rw-r--r--sys/mips/atheros/ar724x_chip.h2
-rw-r--r--sys/mips/atheros/ar724x_pci.c2
-rw-r--r--sys/mips/atheros/ar724xreg.h2
-rw-r--r--sys/mips/atheros/ar91xx_chip.c2
-rw-r--r--sys/mips/atheros/ar91xx_chip.h2
-rw-r--r--sys/mips/atheros/ar91xxreg.h2
-rw-r--r--sys/mips/atheros/ar933x_chip.c2
-rw-r--r--sys/mips/atheros/ar933x_chip.h2
-rw-r--r--sys/mips/atheros/ar933x_uart.h2
-rw-r--r--sys/mips/atheros/ar933xreg.h2
-rw-r--r--sys/mips/atheros/ar934x_chip.c2
-rw-r--r--sys/mips/atheros/ar934x_chip.h2
-rw-r--r--sys/mips/atheros/ar934xreg.h2
-rw-r--r--sys/mips/atheros/if_arge.c2
-rw-r--r--sys/mips/atheros/if_argevar.h2
-rw-r--r--sys/mips/atheros/pcf2123_rtc.c2
-rw-r--r--sys/mips/atheros/pcf2123reg.h2
-rw-r--r--sys/mips/atheros/uart_bus_ar71xx.c2
-rw-r--r--sys/mips/atheros/uart_bus_ar933x.c2
-rw-r--r--sys/mips/atheros/uart_cpu_ar71xx.c2
-rw-r--r--sys/mips/atheros/uart_cpu_ar933x.c2
-rw-r--r--sys/mips/atheros/uart_dev_ar933x.c2
-rw-r--r--sys/mips/atheros/uart_dev_ar933x.h2
-rw-r--r--sys/mips/beri/beri_machdep.c2
-rw-r--r--sys/mips/beri/beri_pic.c2
-rw-r--r--sys/mips/cavium/ciu.c2
-rw-r--r--sys/mips/cavium/if_octm.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-mv88e61xx.c2
-rw-r--r--sys/mips/cavium/octe/ethernet-mv88e61xx.h2
-rw-r--r--sys/mips/cavium/octe/mv88e61xxphy.c2
-rw-r--r--sys/mips/cavium/octe/mv88e61xxphyreg.h2
-rw-r--r--sys/mips/cavium/octe/octe.c2
-rw-r--r--sys/mips/cavium/octe/octebus.c2
-rw-r--r--sys/mips/cavium/octe/octebusvar.h2
-rw-r--r--sys/mips/cavium/octeon_cop2.h2
-rw-r--r--sys/mips/cavium/octeon_gpio.c2
-rw-r--r--sys/mips/cavium/octeon_gpiovar.h2
-rw-r--r--sys/mips/cavium/octeon_machdep.c2
-rw-r--r--sys/mips/cavium/octeon_mp.c2
-rw-r--r--sys/mips/cavium/octeon_pci_console.c2
-rw-r--r--sys/mips/cavium/octeon_pmc.c2
-rw-r--r--sys/mips/cavium/octeon_rnd.c2
-rw-r--r--sys/mips/cavium/octeon_rtc.c2
-rw-r--r--sys/mips/cavium/octeon_wdog.c2
-rw-r--r--sys/mips/cavium/octopci.c2
-rw-r--r--sys/mips/cavium/octopcivar.h2
-rw-r--r--sys/mips/cavium/uart_bus_octeonusart.c2
-rw-r--r--sys/mips/cavium/uart_cpu_octeonusart.c2
-rw-r--r--sys/mips/cavium/uart_dev_oct16550.c2
-rw-r--r--sys/mips/cavium/usb/octusb.c2
-rw-r--r--sys/mips/cavium/usb/octusb.h2
-rw-r--r--sys/mips/cavium/usb/octusb_octeon.c2
-rw-r--r--sys/mips/include/_bus.h2
-rw-r--r--sys/mips/include/atomic.h2
-rw-r--r--sys/mips/include/bus_dma.h2
-rw-r--r--sys/mips/include/counter.h2
-rw-r--r--sys/mips/include/cpufunc.h2
-rw-r--r--sys/mips/include/elf.h2
-rw-r--r--sys/mips/include/fdt.h2
-rw-r--r--sys/mips/include/gdb_machdep.h2
-rw-r--r--sys/mips/include/hwfunc.h2
-rw-r--r--sys/mips/include/intr_machdep.h2
-rw-r--r--sys/mips/include/kdb.h2
-rw-r--r--sys/mips/include/memdev.h2
-rw-r--r--sys/mips/include/metadata.h2
-rw-r--r--sys/mips/include/minidump.h2
-rw-r--r--sys/mips/include/octeon_cop2.h2
-rw-r--r--sys/mips/include/ofw_machdep.h2
-rw-r--r--sys/mips/include/pcpu.h2
-rw-r--r--sys/mips/include/pcpu_aux.h2
-rw-r--r--sys/mips/include/pte.h2
-rw-r--r--sys/mips/include/runq.h2
-rw-r--r--sys/mips/include/sc_machdep.h2
-rw-r--r--sys/mips/include/sf_buf.h2
-rw-r--r--sys/mips/include/tlb.h2
-rw-r--r--sys/mips/include/tls.h2
-rw-r--r--sys/mips/include/vdso.h2
-rw-r--r--sys/mips/include/vm.h2
-rw-r--r--sys/mips/malta/gt.c2
-rw-r--r--sys/mips/malta/gtvar.h2
-rw-r--r--sys/mips/malta/malta_machdep.c2
-rw-r--r--sys/mips/malta/uart_bus_maltausart.c2
-rw-r--r--sys/mips/malta/uart_cpu_maltausart.c2
-rw-r--r--sys/mips/malta/yamon.c2
-rw-r--r--sys/mips/mips/busdma_machdep.c2
-rw-r--r--sys/mips/mips/cpu.c2
-rw-r--r--sys/mips/mips/db_trace.c2
-rw-r--r--sys/mips/mips/dump_machdep.c2
-rw-r--r--sys/mips/mips/elf_machdep.c2
-rw-r--r--sys/mips/mips/elf_trampoline.c2
-rw-r--r--sys/mips/mips/freebsd32_machdep.c2
-rw-r--r--sys/mips/mips/gdb_machdep.c2
-rw-r--r--sys/mips/mips/intr_machdep.c2
-rw-r--r--sys/mips/mips/libkern_machdep.c2
-rw-r--r--sys/mips/mips/minidump_machdep.c2
-rw-r--r--sys/mips/mips/mp_machdep.c2
-rw-r--r--sys/mips/mips/octeon_cop2.c2
-rw-r--r--sys/mips/mips/ptrace_machdep.c2
-rw-r--r--sys/mips/mips/sc_machdep.c2
-rw-r--r--sys/mips/mips/stack_machdep.c2
-rw-r--r--sys/mips/mips/stdatomic.c2
-rw-r--r--sys/mips/mips/tick.c2
-rw-r--r--sys/mips/mips/tlb.c2
-rw-r--r--sys/mips/mips/uma_machdep.c2
-rw-r--r--sys/mips/nlm/board.c2
-rw-r--r--sys/mips/nlm/board.h2
-rw-r--r--sys/mips/nlm/board_cpld.c2
-rw-r--r--sys/mips/nlm/board_eeprom.c2
-rw-r--r--sys/mips/nlm/bus_space_rmi.c2
-rw-r--r--sys/mips/nlm/bus_space_rmi_pci.c2
-rw-r--r--sys/mips/nlm/clock.h2
-rw-r--r--sys/mips/nlm/cms.c2
-rw-r--r--sys/mips/nlm/dev/net/mdio.c2
-rw-r--r--sys/mips/nlm/dev/net/nae.c2
-rw-r--r--sys/mips/nlm/dev/net/sgmii.c2
-rw-r--r--sys/mips/nlm/dev/net/ucore/ucore.h2
-rw-r--r--sys/mips/nlm/dev/net/ucore/ucore_app.c2
-rw-r--r--sys/mips/nlm/dev/net/xaui.c2
-rw-r--r--sys/mips/nlm/dev/net/xlpge.c2
-rw-r--r--sys/mips/nlm/dev/net/xlpge.h2
-rw-r--r--sys/mips/nlm/dev/sec/nlmrsa.c2
-rw-r--r--sys/mips/nlm/dev/sec/nlmrsalib.h2
-rw-r--r--sys/mips/nlm/dev/sec/nlmsec.c2
-rw-r--r--sys/mips/nlm/dev/sec/nlmseclib.c2
-rw-r--r--sys/mips/nlm/dev/sec/nlmseclib.h2
-rw-r--r--sys/mips/nlm/dev/sec/rsa_ucode.h2
-rw-r--r--sys/mips/nlm/hal/bridge.h2
-rw-r--r--sys/mips/nlm/hal/cop2.h2
-rw-r--r--sys/mips/nlm/hal/cpucontrol.h2
-rw-r--r--sys/mips/nlm/hal/fmn.c2
-rw-r--r--sys/mips/nlm/hal/fmn.h2
-rw-r--r--sys/mips/nlm/hal/gbu.h2
-rw-r--r--sys/mips/nlm/hal/haldefs.h2
-rw-r--r--sys/mips/nlm/hal/interlaken.h2
-rw-r--r--sys/mips/nlm/hal/iomap.h2
-rw-r--r--sys/mips/nlm/hal/mdio.h2
-rw-r--r--sys/mips/nlm/hal/mips-extns.h2
-rw-r--r--sys/mips/nlm/hal/mmu.h2
-rw-r--r--sys/mips/nlm/hal/nae.h2
-rw-r--r--sys/mips/nlm/hal/nlm_hal.c2
-rw-r--r--sys/mips/nlm/hal/nlmsaelib.h2
-rw-r--r--sys/mips/nlm/hal/pcibus.h2
-rw-r--r--sys/mips/nlm/hal/pic.h2
-rw-r--r--sys/mips/nlm/hal/poe.h2
-rw-r--r--sys/mips/nlm/hal/sgmii.h2
-rw-r--r--sys/mips/nlm/hal/sys.h2
-rw-r--r--sys/mips/nlm/hal/uart.h2
-rw-r--r--sys/mips/nlm/hal/ucore_loader.h2
-rw-r--r--sys/mips/nlm/hal/usb.h2
-rw-r--r--sys/mips/nlm/hal/xaui.h2
-rw-r--r--sys/mips/nlm/interrupt.h2
-rw-r--r--sys/mips/nlm/intr_machdep.c2
-rw-r--r--sys/mips/nlm/msgring.h2
-rw-r--r--sys/mips/nlm/tick.c2
-rw-r--r--sys/mips/nlm/uart_cpu_xlp.c2
-rw-r--r--sys/mips/nlm/usb_init.c2
-rw-r--r--sys/mips/nlm/xlp.h2
-rw-r--r--sys/mips/nlm/xlp_machdep.c2
-rw-r--r--sys/mips/nlm/xlp_pci.c2
-rw-r--r--sys/modules/dtrace/dtraceall/dtraceall.c2
-rw-r--r--sys/net/bpf_buffer.h2
-rw-r--r--sys/net/bpf_zerocopy.c2
-rw-r--r--sys/net/bpf_zerocopy.h2
-rw-r--r--sys/net/debugnet.c2
-rw-r--r--sys/net/debugnet.h2
-rw-r--r--sys/net/debugnet_inet.c2
-rw-r--r--sys/net/debugnet_int.h2
-rw-r--r--sys/net/firewire.h2
-rw-r--r--sys/net/ieee_oui.h2
-rw-r--r--sys/net/if_dead.c2
-rw-r--r--sys/net/if_debug.c2
-rw-r--r--sys/net/if_enc.c2
-rw-r--r--sys/net/if_enc.h2
-rw-r--r--sys/net/if_epair.c2
-rw-r--r--sys/net/if_gre.c2
-rw-r--r--sys/net/if_gre.h2
-rw-r--r--sys/net/if_llatbl.c2
-rw-r--r--sys/net/if_llatbl.h2
-rw-r--r--sys/net/if_pfsync.h2
-rw-r--r--sys/net/if_tap.h2
-rw-r--r--sys/net/if_tuntap.c2
-rw-r--r--sys/net/netisr.c2
-rw-r--r--sys/net/netisr.h2
-rw-r--r--sys/net/netisr_internal.h2
-rw-r--r--sys/net/netmap.h2
-rw-r--r--sys/net/netmap_legacy.h2
-rw-r--r--sys/net/netmap_user.h2
-rw-r--r--sys/net/route/fib_algo.c2
-rw-r--r--sys/net/route/nhgrp.c2
-rw-r--r--sys/net/route/nhgrp_ctl.c2
-rw-r--r--sys/net/route/nhgrp_var.h2
-rw-r--r--sys/net/route/nhop.c2
-rw-r--r--sys/net/route/nhop.h2
-rw-r--r--sys/net/route/nhop_ctl.c2
-rw-r--r--sys/net/route/nhop_utils.c2
-rw-r--r--sys/net/route/nhop_utils.h2
-rw-r--r--sys/net/route/nhop_var.h2
-rw-r--r--sys/net/route/route_ctl.c2
-rw-r--r--sys/net/route/route_ctl.h2
-rw-r--r--sys/net/route/route_ddb.c2
-rw-r--r--sys/net/route/route_helpers.c2
-rw-r--r--sys/net/route/route_rtentry.c2
-rw-r--r--sys/net/route/route_subscription.c2
-rw-r--r--sys/net/route/route_temporal.c2
-rw-r--r--sys/net/sff8472.h2
-rw-r--r--sys/net/vnet.c2
-rw-r--r--sys/net/vnet.h2
-rw-r--r--sys/net80211/_ieee80211.h2
-rw-r--r--sys/net80211/ieee80211.c2
-rw-r--r--sys/net80211/ieee80211.h2
-rw-r--r--sys/net80211/ieee80211_acl.c2
-rw-r--r--sys/net80211/ieee80211_action.c2
-rw-r--r--sys/net80211/ieee80211_action.h2
-rw-r--r--sys/net80211/ieee80211_adhoc.c2
-rw-r--r--sys/net80211/ieee80211_adhoc.h2
-rw-r--r--sys/net80211/ieee80211_ageq.c2
-rw-r--r--sys/net80211/ieee80211_ageq.h2
-rw-r--r--sys/net80211/ieee80211_alq.c2
-rw-r--r--sys/net80211/ieee80211_alq.h2
-rw-r--r--sys/net80211/ieee80211_crypto.c2
-rw-r--r--sys/net80211/ieee80211_crypto.h2
-rw-r--r--sys/net80211/ieee80211_crypto_ccmp.c2
-rw-r--r--sys/net80211/ieee80211_crypto_none.c2
-rw-r--r--sys/net80211/ieee80211_crypto_tkip.c2
-rw-r--r--sys/net80211/ieee80211_crypto_wep.c2
-rw-r--r--sys/net80211/ieee80211_ddb.c2
-rw-r--r--sys/net80211/ieee80211_dfs.c2
-rw-r--r--sys/net80211/ieee80211_dfs.h2
-rw-r--r--sys/net80211/ieee80211_freebsd.c2
-rw-r--r--sys/net80211/ieee80211_freebsd.h2
-rw-r--r--sys/net80211/ieee80211_hostap.c2
-rw-r--r--sys/net80211/ieee80211_hostap.h2
-rw-r--r--sys/net80211/ieee80211_ht.c2
-rw-r--r--sys/net80211/ieee80211_ht.h2
-rw-r--r--sys/net80211/ieee80211_hwmp.c2
-rw-r--r--sys/net80211/ieee80211_input.c2
-rw-r--r--sys/net80211/ieee80211_input.h2
-rw-r--r--sys/net80211/ieee80211_ioctl.c2
-rw-r--r--sys/net80211/ieee80211_ioctl.h2
-rw-r--r--sys/net80211/ieee80211_mesh.c2
-rw-r--r--sys/net80211/ieee80211_mesh.h2
-rw-r--r--sys/net80211/ieee80211_monitor.c2
-rw-r--r--sys/net80211/ieee80211_monitor.h2
-rw-r--r--sys/net80211/ieee80211_node.c2
-rw-r--r--sys/net80211/ieee80211_node.h2
-rw-r--r--sys/net80211/ieee80211_output.c2
-rw-r--r--sys/net80211/ieee80211_phy.c2
-rw-r--r--sys/net80211/ieee80211_phy.h2
-rw-r--r--sys/net80211/ieee80211_power.c2
-rw-r--r--sys/net80211/ieee80211_power.h2
-rw-r--r--sys/net80211/ieee80211_proto.c2
-rw-r--r--sys/net80211/ieee80211_proto.h2
-rw-r--r--sys/net80211/ieee80211_radiotap.c2
-rw-r--r--sys/net80211/ieee80211_ratectl.c2
-rw-r--r--sys/net80211/ieee80211_ratectl.h2
-rw-r--r--sys/net80211/ieee80211_ratectl_none.c2
-rw-r--r--sys/net80211/ieee80211_regdomain.c2
-rw-r--r--sys/net80211/ieee80211_regdomain.h2
-rw-r--r--sys/net80211/ieee80211_scan.c2
-rw-r--r--sys/net80211/ieee80211_scan.h2
-rw-r--r--sys/net80211/ieee80211_scan_sta.c2
-rw-r--r--sys/net80211/ieee80211_sta.c2
-rw-r--r--sys/net80211/ieee80211_sta.h2
-rw-r--r--sys/net80211/ieee80211_superg.c2
-rw-r--r--sys/net80211/ieee80211_superg.h2
-rw-r--r--sys/net80211/ieee80211_tdma.c2
-rw-r--r--sys/net80211/ieee80211_tdma.h2
-rw-r--r--sys/net80211/ieee80211_var.h2
-rw-r--r--sys/net80211/ieee80211_wds.c2
-rw-r--r--sys/net80211/ieee80211_wds.h2
-rw-r--r--sys/net80211/ieee80211_wps.h2
-rw-r--r--sys/net80211/ieee80211_xauth.c2
-rw-r--r--sys/netgraph/atm/ccatm/ng_ccatm_cust.h2
-rw-r--r--sys/netgraph/atm/ng_sscfu.h2
-rw-r--r--sys/netgraph/atm/ng_sscop.h2
-rw-r--r--sys/netgraph/atm/ng_uni.h2
-rw-r--r--sys/netgraph/atm/ngatmbase.c2
-rw-r--r--sys/netgraph/atm/sscfu/ng_sscfu.c2
-rw-r--r--sys/netgraph/atm/sscfu/ng_sscfu_cust.h2
-rw-r--r--sys/netgraph/atm/sscop/ng_sscop_cust.h2
-rw-r--r--sys/netgraph/atm/uni/ng_uni.c2
-rw-r--r--sys/netgraph/atm/uni/ng_uni_cust.h2
-rw-r--r--sys/netgraph/bluetooth/common/ng_bluetooth.c2
-rw-r--r--sys/netgraph/bluetooth/drivers/h4/ng_h4.c2
-rw-r--r--sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h2
-rw-r--r--sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h2
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c2
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c2
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h2
-rw-r--r--sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_cmds.c2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_cmds.h2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_evnt.c2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_evnt.h2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_main.c2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_misc.c2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_misc.h2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_prse.h2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_ulpi.c2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_ulpi.h2
-rw-r--r--sys/netgraph/bluetooth/hci/ng_hci_var.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_bluetooth.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_btsocket_sco.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_h4.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_hci.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_l2cap.h2
-rw-r--r--sys/netgraph/bluetooth/include/ng_ubt.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h2
-rw-r--r--sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket.c2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c2
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_sco.c2
-rw-r--r--sys/netgraph/netflow/netflow.c2
-rw-r--r--sys/netgraph/netflow/netflow.h2
-rw-r--r--sys/netgraph/netflow/netflow_v9.c2
-rw-r--r--sys/netgraph/netflow/netflow_v9.h2
-rw-r--r--sys/netgraph/netflow/ng_netflow.c2
-rw-r--r--sys/netgraph/netflow/ng_netflow.h2
-rw-r--r--sys/netgraph/ng_atmllc.c2
-rw-r--r--sys/netgraph/ng_atmllc.h2
-rw-r--r--sys/netgraph/ng_car.c2
-rw-r--r--sys/netgraph/ng_car.h2
-rw-r--r--sys/netgraph/ng_deflate.c2
-rw-r--r--sys/netgraph/ng_deflate.h2
-rw-r--r--sys/netgraph/ng_device.c2
-rw-r--r--sys/netgraph/ng_device.h2
-rw-r--r--sys/netgraph/ng_eiface.c2
-rw-r--r--sys/netgraph/ng_eiface.h2
-rw-r--r--sys/netgraph/ng_etf.c2
-rw-r--r--sys/netgraph/ng_etf.h2
-rw-r--r--sys/netgraph/ng_hub.c2
-rw-r--r--sys/netgraph/ng_hub.h2
-rw-r--r--sys/netgraph/ng_ipfw.c2
-rw-r--r--sys/netgraph/ng_ipfw.h2
-rw-r--r--sys/netgraph/ng_macfilter.c2
-rw-r--r--sys/netgraph/ng_macfilter.h2
-rw-r--r--sys/netgraph/ng_nat.c2
-rw-r--r--sys/netgraph/ng_nat.h2
-rw-r--r--sys/netgraph/ng_patch.c2
-rw-r--r--sys/netgraph/ng_patch.h2
-rw-r--r--sys/netgraph/ng_pipe.c2
-rw-r--r--sys/netgraph/ng_pipe.h2
-rw-r--r--sys/netgraph/ng_ppp.c2
-rw-r--r--sys/netgraph/ng_pred1.c2
-rw-r--r--sys/netgraph/ng_pred1.h2
-rw-r--r--sys/netgraph/ng_split.c2
-rw-r--r--sys/netgraph/ng_split.h2
-rw-r--r--sys/netgraph/ng_tag.c2
-rw-r--r--sys/netgraph/ng_tag.h2
-rw-r--r--sys/netgraph/ng_tcpmss.c2
-rw-r--r--sys/netgraph/ng_tcpmss.h2
-rw-r--r--sys/netgraph/ng_vlan.c2
-rw-r--r--sys/netgraph/ng_vlan.h2
-rw-r--r--sys/netgraph/ng_vlan_rotate.c2
-rw-r--r--sys/netgraph/ng_vlan_rotate.h2
-rw-r--r--sys/netgraph/qos.h2
-rw-r--r--sys/netinet/accf_data.c2
-rw-r--r--sys/netinet/accf_dns.c2
-rw-r--r--sys/netinet/accf_http.c2
-rw-r--r--sys/netinet/cc/cc.c2
-rw-r--r--sys/netinet/cc/cc_cdg.c2
-rw-r--r--sys/netinet/cc/cc_chd.c2
-rw-r--r--sys/netinet/cc/cc_cubic.c2
-rw-r--r--sys/netinet/cc/cc_cubic.h2
-rw-r--r--sys/netinet/cc/cc_hd.c2
-rw-r--r--sys/netinet/cc/cc_htcp.c2
-rw-r--r--sys/netinet/cc/cc_module.h2
-rw-r--r--sys/netinet/cc/cc_newreno.c2
-rw-r--r--sys/netinet/cc/cc_vegas.c2
-rw-r--r--sys/netinet/dccp.h2
-rw-r--r--sys/netinet/in_debug.c2
-rw-r--r--sys/netinet/in_fib_algo.c2
-rw-r--r--sys/netinet/in_fib_dxr.c2
-rw-r--r--sys/netinet/in_kdtrace.c2
-rw-r--r--sys/netinet/in_kdtrace.h2
-rw-r--r--sys/netinet/in_pcbgroup.c2
-rw-r--r--sys/netinet/ip_carp.c2
-rw-r--r--sys/netinet/ip_dummynet.h2
-rw-r--r--sys/netinet/ip_fw.h2
-rw-r--r--sys/netinet/ip_id.c2
-rw-r--r--sys/netinet/khelp/h_ertt.c2
-rw-r--r--sys/netinet/khelp/h_ertt.h2
-rw-r--r--sys/netinet/libalias/alias.c2
-rw-r--r--sys/netinet/libalias/alias.h2
-rw-r--r--sys/netinet/libalias/alias_db.c2
-rw-r--r--sys/netinet/libalias/alias_db.h2
-rw-r--r--sys/netinet/libalias/alias_dummy.c2
-rw-r--r--sys/netinet/libalias/alias_ftp.c2
-rw-r--r--sys/netinet/libalias/alias_irc.c2
-rw-r--r--sys/netinet/libalias/alias_local.h2
-rw-r--r--sys/netinet/libalias/alias_mod.c2
-rw-r--r--sys/netinet/libalias/alias_mod.h2
-rw-r--r--sys/netinet/libalias/alias_nbt.c2
-rw-r--r--sys/netinet/libalias/alias_proxy.c2
-rw-r--r--sys/netinet/libalias/alias_sctp.c2
-rw-r--r--sys/netinet/libalias/alias_sctp.h2
-rw-r--r--sys/netinet/libalias/alias_skinny.c2
-rw-r--r--sys/netinet/libalias/alias_smedia.c2
-rw-r--r--sys/netinet/libalias/alias_util.c2
-rw-r--r--sys/netinet/sctp_module.c2
-rw-r--r--sys/netinet/sctp_ss_functions.c2
-rw-r--r--sys/netinet/siftr.c2
-rw-r--r--sys/netinet/tcp_log_buf.c2
-rw-r--r--sys/netinet/tcp_log_buf.h2
-rw-r--r--sys/netinet/tcp_lro.c2
-rw-r--r--sys/netinet/tcp_lro.h2
-rw-r--r--sys/netinet/tcp_offload.c2
-rw-r--r--sys/netinet/tcp_offload.h2
-rw-r--r--sys/netinet/tcp_syncache.c2
-rw-r--r--sys/netinet/toecore.c2
-rw-r--r--sys/netinet/toecore.h2
-rw-r--r--sys/netinet6/in6_fib_algo.c2
-rw-r--r--sys/netinet6/in6_pcbgroup.c2
-rw-r--r--sys/netinet6/ip_fw_nat64.h2
-rw-r--r--sys/netinet6/send.c2
-rw-r--r--sys/netinet6/send.h2
-rw-r--r--sys/netipsec/ipsec_mbuf.c2
-rw-r--r--sys/netipsec/ipsec_output.c2
-rw-r--r--sys/netlink/netlink.h2
-rw-r--r--sys/netlink/netlink_ctl.h2
-rw-r--r--sys/netlink/netlink_domain.c2
-rw-r--r--sys/netlink/netlink_generic.c2
-rw-r--r--sys/netlink/netlink_generic.h2
-rw-r--r--sys/netlink/netlink_io.c2
-rw-r--r--sys/netlink/netlink_linux.h2
-rw-r--r--sys/netlink/netlink_message_parser.c2
-rw-r--r--sys/netlink/netlink_message_parser.h2
-rw-r--r--sys/netlink/netlink_message_writer.c2
-rw-r--r--sys/netlink/netlink_message_writer.h2
-rw-r--r--sys/netlink/netlink_module.c2
-rw-r--r--sys/netlink/netlink_route.c2
-rw-r--r--sys/netlink/netlink_route.h2
-rw-r--r--sys/netlink/netlink_snl.h2
-rw-r--r--sys/netlink/netlink_snl_generic.h2
-rw-r--r--sys/netlink/netlink_snl_route.h2
-rw-r--r--sys/netlink/netlink_snl_route_compat.h2
-rw-r--r--sys/netlink/netlink_snl_route_parsers.h2
-rw-r--r--sys/netlink/netlink_var.h2
-rw-r--r--sys/netlink/route/common.h2
-rw-r--r--sys/netlink/route/iface.c2
-rw-r--r--sys/netlink/route/iface_drivers.c2
-rw-r--r--sys/netlink/route/ifaddrs.h2
-rw-r--r--sys/netlink/route/interface.h2
-rw-r--r--sys/netlink/route/neigh.c2
-rw-r--r--sys/netlink/route/neigh.h2
-rw-r--r--sys/netlink/route/nexthop.c2
-rw-r--r--sys/netlink/route/nexthop.h2
-rw-r--r--sys/netlink/route/route.h2
-rw-r--r--sys/netlink/route/route_var.h2
-rw-r--r--sys/netlink/route/rt.c2
-rw-r--r--sys/netpfil/ipfw/dn_heap.c2
-rw-r--r--sys/netpfil/ipfw/dn_heap.h2
-rw-r--r--sys/netpfil/ipfw/dn_sched.h2
-rw-r--r--sys/netpfil/ipfw/dn_sched_fifo.c2
-rw-r--r--sys/netpfil/ipfw/dn_sched_prio.c2
-rw-r--r--sys/netpfil/ipfw/dn_sched_qfq.c2
-rw-r--r--sys/netpfil/ipfw/dn_sched_rr.c2
-rw-r--r--sys/netpfil/ipfw/dn_sched_wf2q.c2
-rw-r--r--sys/netpfil/ipfw/ip_dn_glue.c2
-rw-r--r--sys/netpfil/ipfw/ip_dn_io.c2
-rw-r--r--sys/netpfil/ipfw/ip_dn_private.h2
-rw-r--r--sys/netpfil/ipfw/ip_dummynet.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw2.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw_dynamic.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw_log.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw_nat.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw_pfil.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw_private.h2
-rw-r--r--sys/netpfil/ipfw/ip_fw_sockopt.c2
-rw-r--r--sys/netpfil/ipfw/ip_fw_table.c2
-rw-r--r--sys/netpfil/ipfw/nat64/ip_fw_nat64.c2
-rw-r--r--sys/netpfil/ipfw/nat64/ip_fw_nat64.h2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64_translate.c2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64_translate.h2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64clat.c2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64clat.h2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64clat_control.c2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64lsn.c2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64lsn.h2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64lsn_control.c2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64stl.c2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64stl.h2
-rw-r--r--sys/netpfil/ipfw/nat64/nat64stl_control.c2
-rw-r--r--sys/netpfil/ipfw/test/test_dn_heap.c2
-rw-r--r--sys/netpfil/pf/if_pfsync.c2
-rw-r--r--sys/netpfil/pf/pf_mtag.h2
-rw-r--r--sys/netpfil/pf/pf_nv.c2
-rw-r--r--sys/netpfil/pf/pf_nv.h2
-rw-r--r--sys/netpfil/pf/pf_table.c2
-rw-r--r--sys/netsmb/netbios.h2
-rw-r--r--sys/netsmb/smb.h2
-rw-r--r--sys/netsmb/smb_conn.c2
-rw-r--r--sys/netsmb/smb_conn.h2
-rw-r--r--sys/netsmb/smb_dev.c2
-rw-r--r--sys/netsmb/smb_dev.h2
-rw-r--r--sys/netsmb/smb_iod.c2
-rw-r--r--sys/netsmb/smb_rq.c2
-rw-r--r--sys/netsmb/smb_rq.h2
-rw-r--r--sys/netsmb/smb_smb.c2
-rw-r--r--sys/netsmb/smb_subr.c2
-rw-r--r--sys/netsmb/smb_subr.h2
-rw-r--r--sys/netsmb/smb_tran.h2
-rw-r--r--sys/netsmb/smb_trantcp.c2
-rw-r--r--sys/netsmb/smb_trantcp.h2
-rw-r--r--sys/netsmb/smb_usr.c2
-rw-r--r--sys/nfs/nfs_kdtrace.h2
-rw-r--r--sys/nfs/nfs_mountcommon.h2
-rw-r--r--sys/nfsserver/nfs_fha_old.h2
-rw-r--r--sys/nlm/nlm.h2
-rw-r--r--sys/nlm/nlm_advlock.c2
-rw-r--r--sys/nlm/nlm_prot_impl.c2
-rw-r--r--sys/nlm/nlm_prot_server.c2
-rw-r--r--sys/nlm/nlm_prot_svc.c2
-rw-r--r--sys/ofed/include/rdma/rdma_sdp.h2
-rw-r--r--sys/opencrypto/xform_chacha20_poly1305.c2
-rw-r--r--sys/powerpc/aim/mmu_oea.c2
-rw-r--r--sys/powerpc/aim/mmu_oea64.c2
-rw-r--r--sys/powerpc/aim/mmu_oea64.h2
-rw-r--r--sys/powerpc/aim/mmu_radix.c2
-rw-r--r--sys/powerpc/aim/moea64_native.c2
-rw-r--r--sys/powerpc/aim/mp_cpudep.c2
-rw-r--r--sys/powerpc/aim/slb.c2
-rw-r--r--sys/powerpc/booke/machdep_e500.c2
-rw-r--r--sys/powerpc/booke/mp_cpudep.c2
-rw-r--r--sys/powerpc/booke/platform_bare.c2
-rw-r--r--sys/powerpc/booke/pmap.c2
-rw-r--r--sys/powerpc/booke/pmap_32.c2
-rw-r--r--sys/powerpc/booke/pmap_64.c2
-rw-r--r--sys/powerpc/cpufreq/dfs.c2
-rw-r--r--sys/powerpc/cpufreq/pcr.c2
-rw-r--r--sys/powerpc/cpufreq/pmcr.c2
-rw-r--r--sys/powerpc/cpufreq/pmufreq.c2
-rw-r--r--sys/powerpc/include/_bus.h2
-rw-r--r--sys/powerpc/include/_inttypes.h2
-rw-r--r--sys/powerpc/include/altivec.h2
-rw-r--r--sys/powerpc/include/atomic.h2
-rw-r--r--sys/powerpc/include/bus_dma.h2
-rw-r--r--sys/powerpc/include/counter.h2
-rw-r--r--sys/powerpc/include/cpufunc.h2
-rw-r--r--sys/powerpc/include/dbdma.h2
-rw-r--r--sys/powerpc/include/elf.h2
-rw-r--r--sys/powerpc/include/gdb_machdep.h2
-rw-r--r--sys/powerpc/include/ifunc.h2
-rw-r--r--sys/powerpc/include/intr_machdep.h2
-rw-r--r--sys/powerpc/include/kdb.h2
-rw-r--r--sys/powerpc/include/machdep.h2
-rw-r--r--sys/powerpc/include/md_var.h2
-rw-r--r--sys/powerpc/include/memdev.h2
-rw-r--r--sys/powerpc/include/metadata.h2
-rw-r--r--sys/powerpc/include/mmuvar.h2
-rw-r--r--sys/powerpc/include/ofw_machdep.h2
-rw-r--r--sys/powerpc/include/openpicvar.h2
-rw-r--r--sys/powerpc/include/pcpu.h2
-rw-r--r--sys/powerpc/include/pcpu_aux.h2
-rw-r--r--sys/powerpc/include/platformvar.h2
-rw-r--r--sys/powerpc/include/rtas.h2
-rw-r--r--sys/powerpc/include/runq.h2
-rw-r--r--sys/powerpc/include/sc_machdep.h2
-rw-r--r--sys/powerpc/include/slb.h2
-rw-r--r--sys/powerpc/include/smp.h2
-rw-r--r--sys/powerpc/include/spr.h2
-rw-r--r--sys/powerpc/include/sr.h2
-rw-r--r--sys/powerpc/include/vdso.h2
-rw-r--r--sys/powerpc/include/vm.h2
-rw-r--r--sys/powerpc/mambo/mambo.c2
-rw-r--r--sys/powerpc/mambo/mambo_console.c2
-rw-r--r--sys/powerpc/mambo/mambo_disk.c2
-rw-r--r--sys/powerpc/mambo/mambocall.h2
-rw-r--r--sys/powerpc/mpc85xx/atpic.c2
-rw-r--r--sys/powerpc/mpc85xx/ds1553_bus_fdt.c2
-rw-r--r--sys/powerpc/mpc85xx/ds1553_core.c2
-rw-r--r--sys/powerpc/mpc85xx/ds1553_reg.h2
-rw-r--r--sys/powerpc/mpc85xx/i2c.c2
-rw-r--r--sys/powerpc/mpc85xx/isa.c2
-rw-r--r--sys/powerpc/mpc85xx/lbc.h2
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx.c2
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx.h2
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx_cache.c2
-rw-r--r--sys/powerpc/mpc85xx/platform_mpc85xx.c2
-rw-r--r--sys/powerpc/ofw/ofw_pcib_pci.c2
-rw-r--r--sys/powerpc/ofw/ofw_pcibus.c2
-rw-r--r--sys/powerpc/ofw/ofw_pcibus.h2
-rw-r--r--sys/powerpc/ofw/ofw_real.c2
-rw-r--r--sys/powerpc/ofw/ofw_syscons.c2
-rw-r--r--sys/powerpc/ofw/ofw_syscons.h2
-rw-r--r--sys/powerpc/ofw/rtas.c2
-rw-r--r--sys/powerpc/powermac/atibl.c2
-rw-r--r--sys/powerpc/powermac/cpcht.c2
-rw-r--r--sys/powerpc/powermac/dbdma.c2
-rw-r--r--sys/powerpc/powermac/dbdmavar.h2
-rw-r--r--sys/powerpc/powermac/fcu.c2
-rw-r--r--sys/powerpc/powermac/macgpio.c2
-rw-r--r--sys/powerpc/powermac/macgpiovar.h2
-rw-r--r--sys/powerpc/powermac/nvbl.c2
-rw-r--r--sys/powerpc/powermac/platform_powermac.c2
-rw-r--r--sys/powerpc/powermac/pmu.c2
-rw-r--r--sys/powerpc/powermac/pmuvar.h2
-rw-r--r--sys/powerpc/powermac/powermac_thermal.c2
-rw-r--r--sys/powerpc/powermac/powermac_thermal.h2
-rw-r--r--sys/powerpc/powermac/pswitch.c2
-rw-r--r--sys/powerpc/powermac/smu.c2
-rw-r--r--sys/powerpc/powermac/smusat.c2
-rw-r--r--sys/powerpc/powermac/uninorth.c2
-rw-r--r--sys/powerpc/powermac/uninorthpci.c2
-rw-r--r--sys/powerpc/powermac/uninorthvar.h2
-rw-r--r--sys/powerpc/powermac/vcoregpio.c2
-rw-r--r--sys/powerpc/powermac/viareg.h2
-rw-r--r--sys/powerpc/powernv/opal_dbg.c2
-rw-r--r--sys/powerpc/powernv/opal_nvram.c2
-rw-r--r--sys/powerpc/powernv/xive.c2
-rw-r--r--sys/powerpc/powerpc/autoconf.c2
-rw-r--r--sys/powerpc/powerpc/bus_machdep.c2
-rw-r--r--sys/powerpc/powerpc/busdma_machdep.c2
-rw-r--r--sys/powerpc/powerpc/clock.c2
-rw-r--r--sys/powerpc/powerpc/copyinout.c2
-rw-r--r--sys/powerpc/powerpc/cpu.c2
-rw-r--r--sys/powerpc/powerpc/db_hwwatch.c2
-rw-r--r--sys/powerpc/powerpc/dump_machdep.c2
-rw-r--r--sys/powerpc/powerpc/elf32_machdep.c2
-rw-r--r--sys/powerpc/powerpc/elf64_machdep.c2
-rw-r--r--sys/powerpc/powerpc/exec_machdep.c2
-rw-r--r--sys/powerpc/powerpc/gdb_machdep.c2
-rw-r--r--sys/powerpc/powerpc/mp_machdep.c2
-rw-r--r--sys/powerpc/powerpc/openpic.c2
-rw-r--r--sys/powerpc/powerpc/platform.c2
-rw-r--r--sys/powerpc/powerpc/pmap_dispatch.c2
-rw-r--r--sys/powerpc/powerpc/sc_machdep.c2
-rw-r--r--sys/powerpc/powerpc/stack_machdep.c2
-rw-r--r--sys/powerpc/powerpc/support.S2
-rw-r--r--sys/powerpc/powerpc/sys_machdep.c2
-rw-r--r--sys/powerpc/ps3/ehci_ps3.c2
-rw-r--r--sys/powerpc/ps3/if_glc.c2
-rw-r--r--sys/powerpc/ps3/if_glcreg.h2
-rw-r--r--sys/powerpc/ps3/mmu_ps3.c2
-rw-r--r--sys/powerpc/ps3/ohci_ps3.c2
-rw-r--r--sys/powerpc/ps3/platform_ps3.c2
-rw-r--r--sys/powerpc/ps3/ps3_syscons.c2
-rw-r--r--sys/powerpc/ps3/ps3bus.c2
-rw-r--r--sys/powerpc/ps3/ps3bus.h2
-rw-r--r--sys/powerpc/ps3/ps3cdrom.c2
-rw-r--r--sys/powerpc/ps3/ps3disk.c2
-rw-r--r--sys/powerpc/ps3/ps3pic.c2
-rw-r--r--sys/powerpc/pseries/mmu_phyp.c2
-rw-r--r--sys/powerpc/pseries/phyp-hvcall.h2
-rw-r--r--sys/powerpc/pseries/phyp_console.c2
-rw-r--r--sys/powerpc/pseries/phyp_dbg.c2
-rw-r--r--sys/powerpc/pseries/phyp_llan.c2
-rw-r--r--sys/powerpc/pseries/phyp_vscsi.c2
-rw-r--r--sys/powerpc/pseries/platform_chrp.c2
-rw-r--r--sys/powerpc/pseries/plpar_iommu.c2
-rw-r--r--sys/powerpc/pseries/plpar_iommu.h2
-rw-r--r--sys/powerpc/pseries/plpar_pcibus.c2
-rw-r--r--sys/powerpc/pseries/rtas_dev.c2
-rw-r--r--sys/powerpc/pseries/rtas_pci.c2
-rw-r--r--sys/powerpc/pseries/vdevice.c2
-rw-r--r--sys/powerpc/pseries/xics.c2
-rw-r--r--sys/riscv/include/gdb_machdep.h2
-rw-r--r--sys/riscv/include/metadata.h2
-rw-r--r--sys/riscv/include/pcpu_aux.h2
-rw-r--r--sys/riscv/riscv/gdb_machdep.c2
-rw-r--r--sys/riscv/riscv/plic.c2
-rw-r--r--sys/riscv/riscv/riscv_syscon.c2
-rw-r--r--sys/riscv/riscv/sbi.c2
-rw-r--r--sys/riscv/riscv/soc.c2
-rw-r--r--sys/riscv/sifive/fe310_aon.c2
-rw-r--r--sys/riscv/sifive/fu740_pci_dw.c2
-rw-r--r--sys/riscv/sifive/sifive_gpio.c2
-rw-r--r--sys/riscv/sifive/sifive_prci.c2
-rw-r--r--sys/riscv/sifive/sifive_spi.c2
-rw-r--r--sys/riscv/sifive/sifive_uart.c2
-rw-r--r--sys/rpc/clnt_rc.c2
-rw-r--r--sys/rpc/getnetconfig.c2
-rw-r--r--sys/rpc/replay.c2
-rw-r--r--sys/rpc/replay.h2
-rw-r--r--sys/rpc/rpcsec_gss.h2
-rw-r--r--sys/rpc/rpcsec_gss/rpcsec_gss_conf.c2
-rw-r--r--sys/rpc/rpcsec_gss/rpcsec_gss_misc.c2
-rw-r--r--sys/rpc/rpcsec_tls.h2
-rw-r--r--sys/rpc/rpcsec_tls/rpctls_impl.c2
-rw-r--r--sys/sys/_atomic64e.h2
-rw-r--r--sys/sys/_atomic_subword.h2
-rw-r--r--sys/sys/_bitset.h2
-rw-r--r--sys/sys/_blockcount.h2
-rw-r--r--sys/sys/_bus_dma.h2
-rw-r--r--sys/sys/_cpuset.h2
-rw-r--r--sys/sys/_domainset.h2
-rw-r--r--sys/sys/_eventhandler.h2
-rw-r--r--sys/sys/_ffcounter.h2
-rw-r--r--sys/sys/_lockmgr.h2
-rw-r--r--sys/sys/_null.h2
-rw-r--r--sys/sys/_pctrie.h2
-rw-r--r--sys/sys/_rangeset.h2
-rw-r--r--sys/sys/_rwlock.h2
-rw-r--r--sys/sys/_semaphore.h2
-rw-r--r--sys/sys/_smr.h2
-rw-r--r--sys/sys/_stack.h2
-rw-r--r--sys/sys/_stdint.h2
-rw-r--r--sys/sys/_sx.h2
-rw-r--r--sys/sys/_task.h2
-rw-r--r--sys/sys/_timeval.h2
-rw-r--r--sys/sys/_tls_variant_i.h2
-rw-r--r--sys/sys/_types.h2
-rw-r--r--sys/sys/_umtx.h2
-rw-r--r--sys/sys/_unrhdr.h2
-rw-r--r--sys/sys/aac_ioctl.h2
-rw-r--r--sys/sys/abi_compat.h2
-rw-r--r--sys/sys/acl.h2
-rw-r--r--sys/sys/agpio.h2
-rw-r--r--sys/sys/aio.h2
-rw-r--r--sys/sys/arb.h2
-rw-r--r--sys/sys/ata.h2
-rw-r--r--sys/sys/atomic_common.h2
-rw-r--r--sys/sys/auxv.h2
-rw-r--r--sys/sys/backlight.h2
-rw-r--r--sys/sys/bitset.h2
-rw-r--r--sys/sys/blockcount.h2
-rw-r--r--sys/sys/boot.h2
-rw-r--r--sys/sys/buf_ring.h2
-rw-r--r--sys/sys/bufobj.h2
-rw-r--r--sys/sys/bus.h2
-rw-r--r--sys/sys/bus_dma_internal.h2
-rw-r--r--sys/sys/busdma_bufalloc.h2
-rw-r--r--sys/sys/caprights.h2
-rw-r--r--sys/sys/capsicum.h2
-rw-r--r--sys/sys/clock.h2
-rw-r--r--sys/sys/cnv.h2
-rw-r--r--sys/sys/compressor.h2
-rw-r--r--sys/sys/condvar.h2
-rw-r--r--sys/sys/copyright.h2
-rw-r--r--sys/sys/counter.h2
-rw-r--r--sys/sys/coverage.h2
-rw-r--r--sys/sys/cpu.h2
-rw-r--r--sys/sys/cpuctl.h2
-rw-r--r--sys/sys/cpuset.h2
-rw-r--r--sys/sys/devmap.h2
-rw-r--r--sys/sys/disk_zone.h2
-rw-r--r--sys/sys/dnv.h2
-rw-r--r--sys/sys/domainset.h2
-rw-r--r--sys/sys/dtrace_bsd.h2
-rw-r--r--sys/sys/elf.h2
-rw-r--r--sys/sys/elf32.h2
-rw-r--r--sys/sys/elf64.h2
-rw-r--r--sys/sys/elf_common.h2
-rw-r--r--sys/sys/elf_generic.h2
-rw-r--r--sys/sys/endian.h2
-rw-r--r--sys/sys/epoch.h2
-rw-r--r--sys/sys/event.h2
-rw-r--r--sys/sys/eventfd.h2
-rw-r--r--sys/sys/eventhandler.h2
-rw-r--r--sys/sys/eventvar.h2
-rw-r--r--sys/sys/extattr.h2
-rw-r--r--sys/sys/fail.h2
-rw-r--r--sys/sys/fdcio.h2
-rw-r--r--sys/sys/firmware.h2
-rw-r--r--sys/sys/font.h2
-rw-r--r--sys/sys/gpio.h2
-rw-r--r--sys/sys/gpt.h2
-rw-r--r--sys/sys/gtaskqueue.h2
-rw-r--r--sys/sys/hash.h2
-rw-r--r--sys/sys/hhook.h2
-rw-r--r--sys/sys/iconv.h2
-rw-r--r--sys/sys/imgact_binmisc.h2
-rw-r--r--sys/sys/interrupt.h2
-rw-r--r--sys/sys/intr.h2
-rw-r--r--sys/sys/iov.h2
-rw-r--r--sys/sys/iov_schema.h2
-rw-r--r--sys/sys/ipmi.h2
-rw-r--r--sys/sys/jail.h2
-rw-r--r--sys/sys/kcov.h2
-rw-r--r--sys/sys/kdb.h2
-rw-r--r--sys/sys/kenv.h2
-rw-r--r--sys/sys/khelp.h2
-rw-r--r--sys/sys/kobj.h2
-rw-r--r--sys/sys/kpilite.h2
-rw-r--r--sys/sys/ksem.h2
-rw-r--r--sys/sys/kthread.h2
-rw-r--r--sys/sys/ktls.h2
-rw-r--r--sys/sys/linker.h2
-rw-r--r--sys/sys/linker_set.h2
-rw-r--r--sys/sys/lock.h2
-rw-r--r--sys/sys/lock_profile.h2
-rw-r--r--sys/sys/lockmgr.h2
-rw-r--r--sys/sys/lockstat.h2
-rw-r--r--sys/sys/loginclass.h2
-rw-r--r--sys/sys/mac.h2
-rw-r--r--sys/sys/mchain.h2
-rw-r--r--sys/sys/memdesc.h2
-rw-r--r--sys/sys/module.h2
-rw-r--r--sys/sys/module_khelp.h2
-rw-r--r--sys/sys/mqueue.h2
-rw-r--r--sys/sys/osd.h2
-rw-r--r--sys/sys/pciio.h2
-rw-r--r--sys/sys/pctrie.h2
-rw-r--r--sys/sys/physmem.h2
-rw-r--r--sys/sys/pidctrl.h2
-rw-r--r--sys/sys/pmc.h2
-rw-r--r--sys/sys/pmckern.h2
-rw-r--r--sys/sys/pmclog.h2
-rw-r--r--sys/sys/power.h2
-rw-r--r--sys/sys/priv.h2
-rw-r--r--sys/sys/procctl.h2
-rw-r--r--sys/sys/procdesc.h2
-rw-r--r--sys/sys/procfs.h2
-rw-r--r--sys/sys/ptio.h2
-rw-r--r--sys/sys/racct.h2
-rw-r--r--sys/sys/random.h2
-rw-r--r--sys/sys/rangelock.h2
-rw-r--r--sys/sys/rangeset.h2
-rw-r--r--sys/sys/rctl.h2
-rw-r--r--sys/sys/refcount.h2
-rw-r--r--sys/sys/reg.h2
-rw-r--r--sys/sys/regression.h2
-rw-r--r--sys/sys/runq.h2
-rw-r--r--sys/sys/rwlock.h2
-rw-r--r--sys/sys/sbuf.h2
-rw-r--r--sys/sys/sched.h2
-rw-r--r--sys/sys/sdt.h2
-rw-r--r--sys/sys/sema.h2
-rw-r--r--sys/sys/serial.h2
-rw-r--r--sys/sys/sf_buf.h2
-rw-r--r--sys/sys/sleepqueue.h2
-rw-r--r--sys/sys/slicer.h2
-rw-r--r--sys/sys/smr.h2
-rw-r--r--sys/sys/smr_types.h2
-rw-r--r--sys/sys/specialfd.h2
-rw-r--r--sys/sys/spigenio.h2
-rw-r--r--sys/sys/stack.h2
-rw-r--r--sys/sys/stdatomic.h2
-rw-r--r--sys/sys/stddef.h2
-rw-r--r--sys/sys/stdint.h2
-rw-r--r--sys/sys/sx.h2
-rw-r--r--sys/sys/syscallsubr.h2
-rw-r--r--sys/sys/taskqueue.h2
-rw-r--r--sys/sys/terminal.h2
-rw-r--r--sys/sys/thr.h2
-rw-r--r--sys/sys/tiio.h2
-rw-r--r--sys/sys/timeet.h2
-rw-r--r--sys/sys/timeffc.h2
-rw-r--r--sys/sys/tree.h2
-rw-r--r--sys/sys/tty.h2
-rw-r--r--sys/sys/ttydevsw.h2
-rw-r--r--sys/sys/ttydisc.h2
-rw-r--r--sys/sys/ttyhook.h2
-rw-r--r--sys/sys/ttyqueue.h2
-rw-r--r--sys/sys/turnstile.h2
-rw-r--r--sys/sys/umtx.h2
-rw-r--r--sys/sys/umtxvar.h2
-rw-r--r--sys/sys/uuid.h2
-rw-r--r--sys/sys/vdso.h2
-rw-r--r--sys/sys/vmem.h2
-rw-r--r--sys/sys/watchdog.h2
-rw-r--r--sys/teken/demo/teken_demo.c2
-rw-r--r--sys/teken/stress/teken_stress.c2
-rw-r--r--sys/teken/teken.c2
-rw-r--r--sys/teken/teken.h2
-rw-r--r--sys/teken/teken_scs.h2
-rw-r--r--sys/teken/teken_subr.h2
-rw-r--r--sys/teken/teken_subr_compat.h2
-rw-r--r--sys/tests/fib_lookup/fib_lookup.c2
-rw-r--r--sys/tests/runtest/runtest.c2
-rw-r--r--sys/tools/acpi_quirks2h.awk2
-rw-r--r--sys/tools/amd64_ia32_vdso.sh2
-rw-r--r--sys/tools/amd64_vdso.sh2
-rw-r--r--sys/tools/arm_kernel_boothdr.awk2
-rw-r--r--sys/tools/bus_macro.sh2
-rw-r--r--sys/tools/embed_mfs.sh2
-rwxr-xr-xsys/tools/fdt/embed_dtb.sh2
-rw-r--r--sys/tools/fw_stub.awk2
-rw-r--r--sys/tools/makesyscalls.lua2
-rw-r--r--sys/tools/sound/feeder_eq_mkfilter.awk2
-rw-r--r--sys/tools/sound/feeder_rate_mkfilter.awk2
-rw-r--r--sys/tools/sound/snd_fxdiv_gen.awk2
-rw-r--r--sys/ufs/ffs/ffs_alloc.c2
-rw-r--r--sys/ufs/ffs/ffs_balloc.c2
-rw-r--r--sys/ufs/ffs/ffs_rawread.c2
-rw-r--r--sys/ufs/ffs/ffs_snapshot.c2
-rw-r--r--sys/ufs/ffs/ffs_softdep.c2
-rw-r--r--sys/ufs/ffs/ffs_suspend.c2
-rw-r--r--sys/ufs/ffs/ffs_vnops.c2
-rw-r--r--sys/ufs/ffs/softdep.h2
-rw-r--r--sys/ufs/ufs/acl.h2
-rw-r--r--sys/ufs/ufs/dinode.h2
-rw-r--r--sys/ufs/ufs/dirhash.h2
-rw-r--r--sys/ufs/ufs/extattr.h2
-rw-r--r--sys/ufs/ufs/gjournal.h2
-rw-r--r--sys/ufs/ufs/ufs_acl.c2
-rw-r--r--sys/ufs/ufs/ufs_dirhash.c2
-rw-r--r--sys/ufs/ufs/ufs_extattr.c2
-rw-r--r--sys/ufs/ufs/ufs_gjournal.c2
-rw-r--r--sys/vm/_vm_phys.h2
-rw-r--r--sys/vm/_vm_radix.h2
-rw-r--r--sys/vm/memguard.c2
-rw-r--r--sys/vm/memguard.h2
-rw-r--r--sys/vm/phys_pager.c2
-rw-r--r--sys/vm/redzone.c2
-rw-r--r--sys/vm/redzone.h2
-rw-r--r--sys/vm/sg_pager.c2
-rw-r--r--sys/vm/uma.h2
-rw-r--r--sys/vm/uma_core.c2
-rw-r--r--sys/vm/uma_dbg.c2
-rw-r--r--sys/vm/uma_dbg.h2
-rw-r--r--sys/vm/uma_int.h2
-rw-r--r--sys/vm/vm_domainset.c2
-rw-r--r--sys/vm/vm_domainset.h2
-rw-r--r--sys/vm/vm_dumpset.h2
-rw-r--r--sys/vm/vm_phys.c2
-rw-r--r--sys/vm/vm_phys.h2
-rw-r--r--sys/vm/vm_radix.c2
-rw-r--r--sys/vm/vm_radix.h2
-rw-r--r--sys/vm/vm_reserv.c2
-rw-r--r--sys/vm/vm_reserv.h2
-rw-r--r--sys/x86/acpica/OsdEnvironment.c2
-rw-r--r--sys/x86/acpica/acpi_apm.c2
-rw-r--r--sys/x86/acpica/madt.c2
-rw-r--r--sys/x86/acpica/srat.c2
-rw-r--r--sys/x86/bios/vpd.c2
-rw-r--r--sys/x86/cpufreq/est.c2
-rw-r--r--sys/x86/cpufreq/hwpstate_amd.c2
-rw-r--r--sys/x86/cpufreq/hwpstate_intel.c2
-rw-r--r--sys/x86/cpufreq/hwpstate_intel_internal.h2
-rw-r--r--sys/x86/cpufreq/p4tcc.c2
-rw-r--r--sys/x86/cpufreq/powernow.c2
-rw-r--r--sys/x86/cpufreq/smist.c2
-rw-r--r--sys/x86/include/acpica_machdep.h2
-rw-r--r--sys/x86/include/apicreg.h2
-rw-r--r--sys/x86/include/apicvar.h2
-rw-r--r--sys/x86/include/busdma_impl.h2
-rw-r--r--sys/x86/include/elf.h2
-rw-r--r--sys/x86/include/fdt.h2
-rw-r--r--sys/x86/include/init.h2
-rw-r--r--sys/x86/include/intr_machdep.h2
-rw-r--r--sys/x86/include/kvm.h2
-rw-r--r--sys/x86/include/legacyvar.h2
-rw-r--r--sys/x86/include/mca.h2
-rw-r--r--sys/x86/include/mptable.h2
-rw-r--r--sys/x86/include/ofw_machdep.h2
-rw-r--r--sys/x86/include/pci_cfgreg.h2
-rw-r--r--sys/x86/include/procctl.h2
-rw-r--r--sys/x86/include/tls.h2
-rw-r--r--sys/x86/include/ucode.h2
-rw-r--r--sys/x86/include/vdso.h2
-rw-r--r--sys/x86/iommu/intel_ctx.c2
-rw-r--r--sys/x86/iommu/intel_dmar.h2
-rw-r--r--sys/x86/iommu/intel_drv.c2
-rw-r--r--sys/x86/iommu/intel_fault.c2
-rw-r--r--sys/x86/iommu/intel_idpgtbl.c2
-rw-r--r--sys/x86/iommu/intel_qi.c2
-rw-r--r--sys/x86/iommu/intel_quirks.c2
-rw-r--r--sys/x86/iommu/intel_reg.h2
-rw-r--r--sys/x86/iommu/intel_utils.c2
-rw-r--r--sys/x86/isa/atpic.c2
-rw-r--r--sys/x86/isa/atrtc.c2
-rw-r--r--sys/x86/isa/elcr.c2
-rw-r--r--sys/x86/isa/isa.c2
-rw-r--r--sys/x86/isa/orm.c2
-rw-r--r--sys/x86/linux/linux_dummy_x86.c2
-rw-r--r--sys/x86/linux/linux_vdso_getcpu_x86.inc2
-rw-r--r--sys/x86/linux/linux_vdso_gettc_x86.inc2
-rw-r--r--sys/x86/linux/linux_x86.c2
-rw-r--r--sys/x86/linux/linux_x86.h2
-rw-r--r--sys/x86/pci/pci_bus.c2
-rw-r--r--sys/x86/pci/pci_early_quirks.c2
-rw-r--r--sys/x86/pci/qpi.c2
-rw-r--r--sys/x86/x86/busdma_bounce.c2
-rw-r--r--sys/x86/x86/busdma_machdep.c2
-rw-r--r--sys/x86/x86/dump_machdep.c2
-rw-r--r--sys/x86/x86/fdt_machdep.c2
-rw-r--r--sys/x86/x86/intr_machdep.c2
-rw-r--r--sys/x86/x86/io_apic.c2
-rw-r--r--sys/x86/x86/mca.c2
-rw-r--r--sys/x86/x86/mptable.c2
-rw-r--r--sys/x86/x86/mptable_pci.c2
-rw-r--r--sys/x86/x86/tsc.c2
-rw-r--r--sys/x86/x86/ucode.c2
-rw-r--r--sys/x86/xen/hvm.c2
-rw-r--r--sys/x86/xen/pvcpu_enum.c2
-rw-r--r--sys/xdr/xdr_mbuf.c2
-rw-r--r--sys/xen/xenbus/xenbusb.h4
-rw-r--r--sys/xen/xenstore/xenstore_internal.h2
-rwxr-xr-xtests/sys/capsicum/functional.sh2
-rw-r--r--tests/sys/devrandom/uint128_test.c2
-rw-r--r--tests/sys/fifo/fifo_kqueue.c2
-rw-r--r--tests/sys/file/path_test.c2
-rw-r--r--tests/sys/fs/fusefs/access.cc2
-rw-r--r--tests/sys/fs/fusefs/allow_other.cc2
-rw-r--r--tests/sys/fs/fusefs/bad_server.cc2
-rw-r--r--tests/sys/fs/fusefs/bmap.cc2
-rw-r--r--tests/sys/fs/fusefs/cache.cc2
-rw-r--r--tests/sys/fs/fusefs/copy_file_range.cc2
-rw-r--r--tests/sys/fs/fusefs/create.cc2
-rw-r--r--tests/sys/fs/fusefs/default_permissions.cc2
-rw-r--r--tests/sys/fs/fusefs/default_permissions_privileged.cc2
-rw-r--r--tests/sys/fs/fusefs/destroy.cc2
-rw-r--r--tests/sys/fs/fusefs/dev_fuse_poll.cc2
-rw-r--r--tests/sys/fs/fusefs/fallocate.cc2
-rw-r--r--tests/sys/fs/fusefs/fifo.cc2
-rw-r--r--tests/sys/fs/fusefs/flush.cc2
-rw-r--r--tests/sys/fs/fusefs/forget.cc2
-rw-r--r--tests/sys/fs/fusefs/fsync.cc2
-rw-r--r--tests/sys/fs/fusefs/fsyncdir.cc2
-rw-r--r--tests/sys/fs/fusefs/getattr.cc2
-rw-r--r--tests/sys/fs/fusefs/interrupt.cc2
-rw-r--r--tests/sys/fs/fusefs/io.cc2
-rw-r--r--tests/sys/fs/fusefs/last_local_modify.cc2
-rw-r--r--tests/sys/fs/fusefs/link.cc2
-rw-r--r--tests/sys/fs/fusefs/locks.cc2
-rw-r--r--tests/sys/fs/fusefs/lookup.cc2
-rw-r--r--tests/sys/fs/fusefs/lseek.cc2
-rw-r--r--tests/sys/fs/fusefs/mkdir.cc2
-rw-r--r--tests/sys/fs/fusefs/mknod.cc2
-rw-r--r--tests/sys/fs/fusefs/mockfs.cc2
-rw-r--r--tests/sys/fs/fusefs/mockfs.hh2
-rw-r--r--tests/sys/fs/fusefs/mount.cc2
-rw-r--r--tests/sys/fs/fusefs/nfs.cc2
-rw-r--r--tests/sys/fs/fusefs/notify.cc2
-rw-r--r--tests/sys/fs/fusefs/open.cc2
-rw-r--r--tests/sys/fs/fusefs/opendir.cc2
-rw-r--r--tests/sys/fs/fusefs/read.cc2
-rw-r--r--tests/sys/fs/fusefs/readdir.cc2
-rw-r--r--tests/sys/fs/fusefs/readlink.cc2
-rw-r--r--tests/sys/fs/fusefs/release.cc2
-rw-r--r--tests/sys/fs/fusefs/releasedir.cc2
-rw-r--r--tests/sys/fs/fusefs/rename.cc2
-rw-r--r--tests/sys/fs/fusefs/rmdir.cc2
-rw-r--r--tests/sys/fs/fusefs/setattr.cc2
-rw-r--r--tests/sys/fs/fusefs/statfs.cc2
-rw-r--r--tests/sys/fs/fusefs/symlink.cc2
-rw-r--r--tests/sys/fs/fusefs/utils.cc2
-rw-r--r--tests/sys/fs/fusefs/utils.hh2
-rw-r--r--tests/sys/fs/fusefs/write.cc2
-rw-r--r--tests/sys/fs/fusefs/xattr.cc2
-rw-r--r--tests/sys/geom/class/eli/misc_test.sh2
-rw-r--r--tests/sys/geom/class/nop/nop_test.sh2
-rw-r--r--tests/sys/geom/class/part/misc.sh2
-rw-r--r--tests/sys/kern/fdgrowtable_test.c2
-rw-r--r--tests/sys/kern/pipe/pipe_kqueue_test.c2
-rwxr-xr-xtests/sys/kern/sendfile_test.sh2
-rw-r--r--tests/sys/kern/socket_msg_trunc.c2
-rw-r--r--tests/sys/kern/sys_getrandom.c2
-rw-r--r--tests/sys/kern/sysctl_kern_proc.c2
-rw-r--r--tests/sys/kern/unix_socketpair_test.c2
-rwxr-xr-xtests/sys/net/if_bridge_test.sh2
-rw-r--r--tests/sys/net/if_epair_test.sh2
-rw-r--r--tests/sys/net/if_gif.sh2
-rw-r--r--tests/sys/net/if_stf.sh2
-rw-r--r--tests/sys/net/if_wg.sh2
-rw-r--r--tests/sys/net/routing/params.h2
-rw-r--r--tests/sys/net/routing/rtsock_common.h2
-rw-r--r--tests/sys/net/routing/rtsock_config.h2
-rw-r--r--tests/sys/net/routing/rtsock_print.h2
-rw-r--r--tests/sys/net/routing/test_rtsock_l3.c2
-rw-r--r--tests/sys/net/routing/test_rtsock_lladdr.c2
-rwxr-xr-xtests/sys/netinet/carp.sh2
-rw-r--r--tests/sys/netinet/socket_afinet.c2
-rw-r--r--tests/sys/netmap/ctrl-api-test.c2
-rw-r--r--tests/sys/netpfil/common/dummynet.sh2
-rw-r--r--tests/sys/netpfil/common/forward.sh2
-rw-r--r--tests/sys/netpfil/common/fragments.sh2
-rw-r--r--tests/sys/netpfil/common/nat.sh2
-rw-r--r--tests/sys/netpfil/common/pass_block.sh2
-rw-r--r--tests/sys/netpfil/common/pft_synflood.py2
-rw-r--r--tests/sys/netpfil/common/rdr.sh2
-rw-r--r--tests/sys/netpfil/common/runner.subr2
-rw-r--r--tests/sys/netpfil/common/sniffer.py2
-rw-r--r--tests/sys/netpfil/common/tos.sh2
-rw-r--r--tests/sys/netpfil/common/utils.subr2
-rw-r--r--tests/sys/netpfil/pf/CVE-2019-5597.py2
-rw-r--r--tests/sys/netpfil/pf/CVE-2019-5598.py2
-rw-r--r--tests/sys/netpfil/pf/anchor.sh2
-rw-r--r--tests/sys/netpfil/pf/checksum.sh2
-rw-r--r--tests/sys/netpfil/pf/dup.sh2
-rw-r--r--tests/sys/netpfil/pf/echo_inetd.conf2
-rw-r--r--tests/sys/netpfil/pf/forward.sh2
-rw-r--r--tests/sys/netpfil/pf/fragmentation.sh2
-rw-r--r--tests/sys/netpfil/pf/get_state.sh2
-rw-r--r--tests/sys/netpfil/pf/icmp.sh2
-rw-r--r--tests/sys/netpfil/pf/killstate.sh2
-rw-r--r--tests/sys/netpfil/pf/map_e.sh2
-rw-r--r--tests/sys/netpfil/pf/names.sh2
-rw-r--r--tests/sys/netpfil/pf/nat.sh2
-rw-r--r--tests/sys/netpfil/pf/pass_block.sh2
-rw-r--r--tests/sys/netpfil/pf/pfsync.sh2
-rw-r--r--tests/sys/netpfil/pf/proxy.sh2
-rw-r--r--tests/sys/netpfil/pf/ridentifier.sh2
-rw-r--r--tests/sys/netpfil/pf/route_to.sh2
-rw-r--r--tests/sys/netpfil/pf/rules_counter.sh2
-rw-r--r--tests/sys/netpfil/pf/set_skip.sh2
-rw-r--r--tests/sys/netpfil/pf/set_tos.sh2
-rwxr-xr-xtests/sys/netpfil/pf/src_track.sh2
-rw-r--r--tests/sys/netpfil/pf/syncookie.sh2
-rw-r--r--tests/sys/netpfil/pf/synproxy.sh2
-rw-r--r--tests/sys/netpfil/pf/table.sh2
-rw-r--r--tests/sys/netpfil/pf/tos.sh2
-rw-r--r--tests/sys/netpfil/pf/utils.subr2
-rw-r--r--tests/sys/posixshm/memfd_test.c2
-rw-r--r--tests/sys/sys/bitset_test.c2
-rw-r--r--tests/sys/vm/mlock_test.c2
-rw-r--r--tests/sys/vmm/utils.subr2
-rw-r--r--tests/sys/vmm/vmm_cred_jail.sh2
-rwxr-xr-xtools/build/make.py2
-rw-r--r--tools/pkgbase/metalog_reader.lua2
-rw-r--r--tools/test/gpioevents/gpioevents.c2
-rw-r--r--tools/test/popss/popss.c2
-rw-r--r--tools/test/vm86/vm86_test.c2
-rw-r--r--tools/test/vm86/vm86_test_asm.s2
-rwxr-xr-xtools/tools/git/git-svn-init2
-rwxr-xr-xtools/tools/git/git-svn-rebase2
-rw-r--r--tools/tools/intel-ucode-split/intel-ucode-split.c2
-rw-r--r--tools/tools/locale/tools/charmaps.pm2
-rwxr-xr-xtools/tools/locale/tools/cldr2def.pl2
-rw-r--r--tools/tools/locale/tools/extract-colldef.awk2
-rwxr-xr-xtools/tools/locale/tools/finalize2
-rwxr-xr-xtools/tools/locale/tools/mkwidths.pl2
-rwxr-xr-xtools/tools/locale/tools/utf8-rollup.pl2
-rw-r--r--tools/uma/smrstress/smrstress.c2
-rw-r--r--usr.bin/ar/acplex.l2
-rw-r--r--usr.bin/ar/acpyacc.y2
-rw-r--r--usr.bin/ar/ar.h2
-rw-r--r--usr.bin/ar/read.c2
-rw-r--r--usr.bin/ar/util.c2
-rw-r--r--usr.bin/ar/write.c2
-rw-r--r--usr.bin/at/at.c2
-rw-r--r--usr.bin/at/at.h2
-rw-r--r--usr.bin/at/panic.c2
-rw-r--r--usr.bin/at/panic.h2
-rw-r--r--usr.bin/at/parsetime.c2
-rw-r--r--usr.bin/at/parsetime.h2
-rw-r--r--usr.bin/at/perm.c2
-rw-r--r--usr.bin/at/perm.h2
-rw-r--r--usr.bin/at/privs.h2
-rw-r--r--usr.bin/backlight/backlight.c2
-rw-r--r--usr.bin/bluetooth/bthost/bthost.c2
-rw-r--r--usr.bin/bluetooth/btsockstat/btsockstat.c2
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c2
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c2
-rw-r--r--usr.bin/bsdiff/bsdiff/bsdiff.c2
-rw-r--r--usr.bin/bsdiff/bspatch/bspatch.c2
-rw-r--r--usr.bin/c89/c89.c2
-rw-r--r--usr.bin/c99/c99.c2
-rw-r--r--usr.bin/calendar/dates.c2
-rw-r--r--usr.bin/calendar/events.c2
-rw-r--r--usr.bin/calendar/ostern.c2
-rw-r--r--usr.bin/calendar/parsedata.c2
-rw-r--r--usr.bin/calendar/paskha.c2
-rw-r--r--usr.bin/calendar/sunpos.c2
-rw-r--r--usr.bin/cmp/link.c2
-rwxr-xr-xusr.bin/cmp/tests/cmp_test2.sh2
-rw-r--r--usr.bin/compress/zopen.h2
-rw-r--r--usr.bin/cpuset/cpuset.c2
-rw-r--r--usr.bin/csplit/csplit.c2
-rw-r--r--usr.bin/ctlstat/ctlstat.c2
-rwxr-xr-xusr.bin/dc/tests/bcode.sh2
-rwxr-xr-xusr.bin/dc/tests/inout.sh2
-rw-r--r--usr.bin/dtc/checking.cc2
-rw-r--r--usr.bin/dtc/checking.hh2
-rw-r--r--usr.bin/dtc/dtb.cc2
-rw-r--r--usr.bin/dtc/dtb.hh2
-rw-r--r--usr.bin/dtc/dtc.cc2
-rw-r--r--usr.bin/dtc/fdt.cc2
-rw-r--r--usr.bin/dtc/fdt.hh2
-rw-r--r--usr.bin/dtc/input_buffer.cc2
-rw-r--r--usr.bin/dtc/input_buffer.hh2
-rw-r--r--usr.bin/dtc/string.cc2
-rw-r--r--usr.bin/dtc/util.hh2
-rw-r--r--usr.bin/elfctl/elfctl.c2
-rw-r--r--usr.bin/elfdump/elfdump.c2
-rw-r--r--usr.bin/env/envopts.c2
-rw-r--r--usr.bin/env/envopts.h2
-rw-r--r--usr.bin/finger/pathnames.h2
-rw-r--r--usr.bin/fstat/functions.h2
-rw-r--r--usr.bin/fstat/fuser.c2
-rw-r--r--usr.bin/fstat/main.c2
-rw-r--r--usr.bin/fsync/fsync.c2
-rw-r--r--usr.bin/gcore/elfcore.c2
-rw-r--r--usr.bin/getent/getent.c2
-rw-r--r--usr.bin/grep/file.c2
-rw-r--r--usr.bin/grep/grep.c2
-rw-r--r--usr.bin/grep/grep.h2
-rw-r--r--usr.bin/grep/queue.c2
-rwxr-xr-xusr.bin/grep/tests/grep_freebsd_test.sh2
-rw-r--r--usr.bin/grep/util.c2
-rw-r--r--usr.bin/gzip/tests/zdiff_test.sh2
-rw-r--r--usr.bin/gzip/unpack.c2
-rwxr-xr-xusr.bin/hexdump/tests/hexdump_test.sh2
-rwxr-xr-xusr.bin/hexdump/tests/od_test.sh2
-rw-r--r--usr.bin/indent/indent.h2
-rw-r--r--usr.bin/iscsictl/iscsictl.c2
-rw-r--r--usr.bin/iscsictl/iscsictl.h2
-rw-r--r--usr.bin/iscsictl/parse.y2
-rw-r--r--usr.bin/iscsictl/token.l2
-rw-r--r--usr.bin/kdump/linux.c2
-rw-r--r--usr.bin/killall/killall.c2
-rw-r--r--usr.bin/ktrdump/ktrdump.c2
-rw-r--r--usr.bin/lastcomm/readrec.c2
-rw-r--r--usr.bin/locale/locale.c2
-rwxr-xr-xusr.bin/locale/tests/locale_test.sh2
-rw-r--r--usr.bin/locate/locate/concatdb.sh2
-rw-r--r--usr.bin/locate/locate/mklocatedb.sh2
-rw-r--r--usr.bin/locate/locate/updatedb.sh2
-rw-r--r--usr.bin/lockf/lockf.c2
-rw-r--r--usr.bin/login/login.h2
-rwxr-xr-xusr.bin/man/man.sh2
-rw-r--r--usr.bin/mktemp/mktemp.c2
-rwxr-xr-xusr.bin/mktemp/tests/mktemp_test.sh2
-rw-r--r--usr.bin/mkuzip/mkuz_zstd.c2
-rw-r--r--usr.bin/mkuzip/mkuz_zstd.h2
-rw-r--r--usr.bin/mkuzip/mkuzip.c2
-rw-r--r--usr.bin/ncal/ncal.c2
-rw-r--r--usr.bin/netstat/bpf.c2
-rw-r--r--usr.bin/netstat/netisr.c2
-rw-r--r--usr.bin/netstat/nhgrp.c2
-rw-r--r--usr.bin/newgrp/newgrp.c2
-rwxr-xr-xusr.bin/patch/tests/unified_patch_test.sh2
-rw-r--r--usr.bin/pathchk/pathchk.c2
-rw-r--r--usr.bin/perror/perror.c2
-rw-r--r--usr.bin/pr/tests/basic2_test.sh2
-rw-r--r--usr.bin/procstat/procstat.c2
-rw-r--r--usr.bin/procstat/procstat.h2
-rw-r--r--usr.bin/procstat/procstat_advlock.c2
-rw-r--r--usr.bin/procstat/procstat_args.c2
-rw-r--r--usr.bin/procstat/procstat_auxv.c2
-rw-r--r--usr.bin/procstat/procstat_basic.c2
-rw-r--r--usr.bin/procstat/procstat_bin.c2
-rw-r--r--usr.bin/procstat/procstat_cred.c2
-rw-r--r--usr.bin/procstat/procstat_files.c2
-rw-r--r--usr.bin/procstat/procstat_kstack.c2
-rw-r--r--usr.bin/procstat/procstat_penv.c2
-rw-r--r--usr.bin/procstat/procstat_pwdx.c2
-rw-r--r--usr.bin/procstat/procstat_rlimit.c2
-rw-r--r--usr.bin/procstat/procstat_sigs.c2
-rw-r--r--usr.bin/procstat/procstat_threads.c2
-rw-r--r--usr.bin/procstat/procstat_vm.c2
-rw-r--r--usr.bin/protect/protect.c2
-rw-r--r--usr.bin/rctl/rctl.c2
-rw-r--r--usr.bin/revoke/revoke.c2
-rw-r--r--usr.bin/sdiotool/cam_sdio.h2
-rw-r--r--usr.bin/sdiotool/linux_compat.h2
-rw-r--r--usr.bin/sdiotool/linux_sdio_compat.h2
-rw-r--r--usr.bin/setchannel/setchannel.c2
-rw-r--r--usr.bin/sockstat/sockstat.c2
-rw-r--r--usr.bin/sort/bwstring.c2
-rw-r--r--usr.bin/sort/bwstring.h2
-rw-r--r--usr.bin/sort/coll.c2
-rw-r--r--usr.bin/sort/coll.h2
-rw-r--r--usr.bin/sort/file.c2
-rw-r--r--usr.bin/sort/file.h2
-rw-r--r--usr.bin/sort/mem.c2
-rw-r--r--usr.bin/sort/mem.h2
-rw-r--r--usr.bin/sort/radixsort.c2
-rw-r--r--usr.bin/sort/radixsort.h2
-rw-r--r--usr.bin/sort/sort.c2
-rw-r--r--usr.bin/sort/sort.h2
-rw-r--r--usr.bin/sort/vsort.c2
-rw-r--r--usr.bin/sort/vsort.h2
-rwxr-xr-xusr.bin/split/tests/split_test.sh2
-rwxr-xr-xusr.bin/ssh-copy-id/ssh-copy-id.sh2
-rw-r--r--usr.bin/stdbuf/stdbuf.c2
-rw-r--r--usr.bin/systat/devs.h2
-rw-r--r--usr.bin/systat/proc.c2
-rw-r--r--usr.bin/systat/sysput.c2
-rw-r--r--usr.bin/systat/zarc.c2
-rw-r--r--usr.bin/tabs/tabs.c2
-rwxr-xr-xusr.bin/tail/tests/tail_test.sh2
-rw-r--r--usr.bin/tr/cmap.c2
-rw-r--r--usr.bin/tr/cmap.h2
-rw-r--r--usr.bin/tr/cset.c2
-rw-r--r--usr.bin/tr/cset.h2
-rw-r--r--usr.bin/truncate/truncate.c2
-rw-r--r--usr.bin/truss/truss.h2
-rw-r--r--usr.bin/unifdef/unifdef.c2
-rw-r--r--usr.bin/unifdef/unifdefall.sh2
-rw-r--r--usr.bin/units/units.c2
-rw-r--r--usr.bin/unzip/unzip.c2
-rw-r--r--usr.bin/whereis/pathnames.h2
-rw-r--r--usr.bin/whereis/whereis.c2
-rw-r--r--usr.bin/who/who.c2
-rw-r--r--usr.sbin/ac/ac.c2
-rw-r--r--usr.sbin/acpi/acpiconf/acpiconf.c2
-rw-r--r--usr.sbin/acpi/acpidb/acpidb.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpi.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpi_user.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.c2
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.h2
-rw-r--r--usr.sbin/adduser/adduser.sh2
-rw-r--r--usr.sbin/adduser/rmuser.sh2
-rw-r--r--usr.sbin/apmd/apmd.c2
-rw-r--r--usr.sbin/apmd/apmd.h2
-rw-r--r--usr.sbin/apmd/apmdlex.l2
-rw-r--r--usr.sbin/apmd/apmdparse.y2
-rw-r--r--usr.sbin/autofs/automount.c2
-rw-r--r--usr.sbin/autofs/automountd.c2
-rw-r--r--usr.sbin/autofs/autounmountd.c2
-rw-r--r--usr.sbin/autofs/common.c2
-rw-r--r--usr.sbin/autofs/common.h2
-rw-r--r--usr.sbin/autofs/defined.c2
-rw-r--r--usr.sbin/autofs/log.c2
-rw-r--r--usr.sbin/autofs/token.l2
-rw-r--r--usr.sbin/bhyve/acpi.c2
-rw-r--r--usr.sbin/bhyve/acpi.h2
-rw-r--r--usr.sbin/bhyve/acpi_device.c2
-rw-r--r--usr.sbin/bhyve/acpi_device.h2
-rw-r--r--usr.sbin/bhyve/ahci.h2
-rw-r--r--usr.sbin/bhyve/atkbdc.c2
-rw-r--r--usr.sbin/bhyve/audio.c2
-rw-r--r--usr.sbin/bhyve/audio.h2
-rw-r--r--usr.sbin/bhyve/bhyvegc.c2
-rw-r--r--usr.sbin/bhyve/bhyvegc.h2
-rw-r--r--usr.sbin/bhyve/bhyverun.c2
-rw-r--r--usr.sbin/bhyve/bhyverun.h2
-rw-r--r--usr.sbin/bhyve/block_if.c2
-rw-r--r--usr.sbin/bhyve/block_if.h2
-rw-r--r--usr.sbin/bhyve/bootrom.c2
-rw-r--r--usr.sbin/bhyve/bootrom.h2
-rw-r--r--usr.sbin/bhyve/config.c2
-rw-r--r--usr.sbin/bhyve/config.h2
-rw-r--r--usr.sbin/bhyve/console.c2
-rw-r--r--usr.sbin/bhyve/console.h2
-rw-r--r--usr.sbin/bhyve/debug.h2
-rw-r--r--usr.sbin/bhyve/fwctl.c2
-rw-r--r--usr.sbin/bhyve/fwctl.h2
-rw-r--r--usr.sbin/bhyve/gdb.c2
-rw-r--r--usr.sbin/bhyve/gdb.h2
-rw-r--r--usr.sbin/bhyve/hda_codec.c2
-rw-r--r--usr.sbin/bhyve/hda_reg.h2
-rw-r--r--usr.sbin/bhyve/hdac_reg.h2
-rw-r--r--usr.sbin/bhyve/inout.c2
-rw-r--r--usr.sbin/bhyve/inout.h2
-rw-r--r--usr.sbin/bhyve/ioapic.c2
-rw-r--r--usr.sbin/bhyve/ioapic.h2
-rw-r--r--usr.sbin/bhyve/iov.c2
-rw-r--r--usr.sbin/bhyve/iov.h2
-rw-r--r--usr.sbin/bhyve/ipc.h2
-rw-r--r--usr.sbin/bhyve/kernemu_dev.c2
-rw-r--r--usr.sbin/bhyve/kernemu_dev.h2
-rw-r--r--usr.sbin/bhyve/mem.c2
-rw-r--r--usr.sbin/bhyve/mem.h2
-rw-r--r--usr.sbin/bhyve/mevent.c2
-rw-r--r--usr.sbin/bhyve/mevent.h2
-rw-r--r--usr.sbin/bhyve/mevent_test.c2
-rw-r--r--usr.sbin/bhyve/mptbl.c2
-rw-r--r--usr.sbin/bhyve/mptbl.h2
-rw-r--r--usr.sbin/bhyve/net_backends.c2
-rw-r--r--usr.sbin/bhyve/net_backends.h2
-rw-r--r--usr.sbin/bhyve/net_utils.c2
-rw-r--r--usr.sbin/bhyve/net_utils.h2
-rw-r--r--usr.sbin/bhyve/pci_ahci.c2
-rw-r--r--usr.sbin/bhyve/pci_e82545.c2
-rw-r--r--usr.sbin/bhyve/pci_emul.c2
-rw-r--r--usr.sbin/bhyve/pci_emul.h2
-rw-r--r--usr.sbin/bhyve/pci_fbuf.c2
-rw-r--r--usr.sbin/bhyve/pci_hda.c2
-rw-r--r--usr.sbin/bhyve/pci_hda.h2
-rw-r--r--usr.sbin/bhyve/pci_hostbridge.c2
-rw-r--r--usr.sbin/bhyve/pci_irq.c2
-rw-r--r--usr.sbin/bhyve/pci_irq.h2
-rw-r--r--usr.sbin/bhyve/pci_lpc.c2
-rw-r--r--usr.sbin/bhyve/pci_lpc.h2
-rw-r--r--usr.sbin/bhyve/pci_nvme.c2
-rw-r--r--usr.sbin/bhyve/pci_passthru.c2
-rw-r--r--usr.sbin/bhyve/pci_passthru.h2
-rw-r--r--usr.sbin/bhyve/pci_uart.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_block.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_console.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_input.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_net.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_rnd.c2
-rw-r--r--usr.sbin/bhyve/pci_virtio_scsi.c2
-rw-r--r--usr.sbin/bhyve/pci_xhci.c2
-rw-r--r--usr.sbin/bhyve/pci_xhci.h2
-rw-r--r--usr.sbin/bhyve/pctestdev.c2
-rw-r--r--usr.sbin/bhyve/pctestdev.h2
-rw-r--r--usr.sbin/bhyve/pm.c2
-rw-r--r--usr.sbin/bhyve/post.c2
-rw-r--r--usr.sbin/bhyve/ps2kbd.c2
-rw-r--r--usr.sbin/bhyve/ps2kbd.h2
-rw-r--r--usr.sbin/bhyve/ps2mouse.c2
-rw-r--r--usr.sbin/bhyve/ps2mouse.h2
-rw-r--r--usr.sbin/bhyve/qemu_fwcfg.c2
-rw-r--r--usr.sbin/bhyve/qemu_fwcfg.h2
-rw-r--r--usr.sbin/bhyve/rfb.c2
-rw-r--r--usr.sbin/bhyve/rfb.h2
-rw-r--r--usr.sbin/bhyve/rtc.c2
-rw-r--r--usr.sbin/bhyve/rtc.h2
-rw-r--r--usr.sbin/bhyve/smbiostbl.c2
-rw-r--r--usr.sbin/bhyve/smbiostbl.h2
-rw-r--r--usr.sbin/bhyve/snapshot.c2
-rw-r--r--usr.sbin/bhyve/snapshot.h2
-rw-r--r--usr.sbin/bhyve/sockstream.c2
-rw-r--r--usr.sbin/bhyve/sockstream.h2
-rw-r--r--usr.sbin/bhyve/spinup_ap.c2
-rw-r--r--usr.sbin/bhyve/spinup_ap.h2
-rw-r--r--usr.sbin/bhyve/task_switch.c2
-rw-r--r--usr.sbin/bhyve/uart_emul.c2
-rw-r--r--usr.sbin/bhyve/uart_emul.h2
-rw-r--r--usr.sbin/bhyve/usb_emul.c2
-rw-r--r--usr.sbin/bhyve/usb_emul.h2
-rw-r--r--usr.sbin/bhyve/usb_mouse.c2
-rw-r--r--usr.sbin/bhyve/vga.c2
-rw-r--r--usr.sbin/bhyve/vga.h2
-rw-r--r--usr.sbin/bhyve/virtio.c2
-rw-r--r--usr.sbin/bhyve/virtio.h2
-rw-r--r--usr.sbin/bhyve/vmgenc.c2
-rw-r--r--usr.sbin/bhyve/vmgenc.h2
-rw-r--r--usr.sbin/bhyve/xmsr.c2
-rw-r--r--usr.sbin/bhyve/xmsr.h2
-rw-r--r--usr.sbin/bhyvectl/bhyvectl.c2
-rw-r--r--usr.sbin/bhyveload/bhyveload.c2
-rw-r--r--usr.sbin/bluetooth/bcmfw/bcmfw.c2
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c2
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h2
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/hid.c2
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/sdp.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/bthid_config.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/bthidd.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/bthidd.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/btuinput.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/btuinput.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/client.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/hid.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/kbd.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/kbd.h2
-rw-r--r--usr.sbin/bluetooth/bthidd/lexer.l2
-rw-r--r--usr.sbin/bluetooth/bthidd/parser.y2
-rw-r--r--usr.sbin/bluetooth/bthidd/server.c2
-rw-r--r--usr.sbin/bluetooth/bthidd/session.c2
-rw-r--r--usr.sbin/bluetooth/btpand/client.c2
-rw-r--r--usr.sbin/bluetooth/btpand/event.c2
-rw-r--r--usr.sbin/bluetooth/btpand/event.h2
-rw-r--r--usr.sbin/bluetooth/hccontrol/adv_data.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/hccontrol.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/hccontrol.h2
-rw-r--r--usr.sbin/bluetooth/hccontrol/host_controller_baseband.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/info.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/link_control.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/link_policy.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/node.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/send_recv.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/status.c2
-rw-r--r--usr.sbin/bluetooth/hccontrol/util.c2
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.c2
-rw-r--r--usr.sbin/bluetooth/hcsecd/hcsecd.h2
-rw-r--r--usr.sbin/bluetooth/hcsecd/lexer.l2
-rw-r--r--usr.sbin/bluetooth/hcsecd/parser.y2
-rw-r--r--usr.sbin/bluetooth/hcseriald/hcseriald.c2
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/iwmbt_dbg.h2
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c2
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.h2
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c2
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.h2
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/main.c2
-rw-r--r--usr.sbin/bluetooth/l2control/l2cap.c2
-rw-r--r--usr.sbin/bluetooth/l2control/l2control.c2
-rw-r--r--usr.sbin/bluetooth/l2control/l2control.h2
-rw-r--r--usr.sbin/bluetooth/l2ping/l2ping.c2
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c2
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c2
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h2
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/search.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/audio_sink.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/audio_source.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/bgd.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/dun.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/ftrn.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/gn.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/irmc.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/irmc_command.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/lan.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/log.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/log.h2
-rw-r--r--usr.sbin/bluetooth/sdpd/main.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/nap.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/opush.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/panu.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/profile.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/profile.h2
-rw-r--r--usr.sbin/bluetooth/sdpd/provider.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/provider.h2
-rw-r--r--usr.sbin/bluetooth/sdpd/sar.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/scr.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/sd.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/server.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/server.h2
-rw-r--r--usr.sbin/bluetooth/sdpd/sp.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/srr.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/ssar.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/ssr.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/sur.c2
-rw-r--r--usr.sbin/bluetooth/sdpd/uuid-private.h2
-rw-r--r--usr.sbin/bluetooth/sdpd/uuid.c2
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.c2
-rw-r--r--usr.sbin/bsdinstall/distextract/distextract.c2
-rw-r--r--usr.sbin/bsdinstall/distfetch/distfetch.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/diskeditor.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/diskeditor.h2
-rw-r--r--usr.sbin/bsdinstall/partedit/gpart_ops.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/part_wizard.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit.h2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_generic.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_powerpc.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_x86.c2
-rw-r--r--usr.sbin/bsdinstall/partedit/scripted.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c2
-rw-r--r--usr.sbin/btxld/btx.h2
-rw-r--r--usr.sbin/btxld/btxld.c2
-rw-r--r--usr.sbin/btxld/elfh.c2
-rw-r--r--usr.sbin/btxld/elfh.h2
-rw-r--r--usr.sbin/certctl/certctl.82
-rwxr-xr-xusr.sbin/certctl/certctl.sh2
-rw-r--r--usr.sbin/ckdist/ckdist.c2
-rw-r--r--usr.sbin/clear_locks/clear_locks.c2
-rw-r--r--usr.sbin/cpucontrol/amd.c2
-rw-r--r--usr.sbin/cpucontrol/amd.h2
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.c2
-rw-r--r--usr.sbin/cpucontrol/cpucontrol.h2
-rw-r--r--usr.sbin/cpucontrol/intel.c2
-rw-r--r--usr.sbin/cpucontrol/intel.h2
-rw-r--r--usr.sbin/cpucontrol/via.c2
-rw-r--r--usr.sbin/cpucontrol/via.h2
-rw-r--r--usr.sbin/ctladm/ctladm.c2
-rw-r--r--usr.sbin/ctld/ctld.c2
-rw-r--r--usr.sbin/ctld/ctld.h2
-rw-r--r--usr.sbin/ctld/discovery.c2
-rw-r--r--usr.sbin/ctld/isns.c2
-rw-r--r--usr.sbin/ctld/kernel.c2
-rw-r--r--usr.sbin/ctld/login.c2
-rw-r--r--usr.sbin/ctld/parse.y2
-rw-r--r--usr.sbin/ctld/token.l2
-rw-r--r--usr.sbin/ctld/uclparse.c2
-rw-r--r--usr.sbin/cxgbetool/tcb_common.c2
-rw-r--r--usr.sbin/cxgbetool/tcb_common.h2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot4.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot5.c2
-rw-r--r--usr.sbin/cxgbetool/tcbinfot6.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt4.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt5.c2
-rw-r--r--usr.sbin/cxgbetool/tcbshowt6.c2
-rw-r--r--usr.sbin/daemon/tests/daemon_test.sh2
-rw-r--r--usr.sbin/devinfo/devinfo.c2
-rw-r--r--usr.sbin/dumpcis/main.c2
-rwxr-xr-xusr.sbin/etcupdate/etcupdate.sh2
-rw-r--r--usr.sbin/extattrctl/extattrctl.c2
-rw-r--r--usr.sbin/fdcontrol/fdcontrol.c2
-rw-r--r--usr.sbin/fdformat/fdformat.c2
-rw-r--r--usr.sbin/fdread/fdread.c2
-rw-r--r--usr.sbin/fdread/fdutil.c2
-rw-r--r--usr.sbin/fdread/fdutil.h2
-rw-r--r--usr.sbin/fifolog/fifolog_create/fifolog_create.c2
-rw-r--r--usr.sbin/fifolog/fifolog_reader/fifolog_reader.c2
-rw-r--r--usr.sbin/fifolog/fifolog_writer/fifolog_writer.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog.h2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_create.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_int.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_reader.c2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_write.h2
-rw-r--r--usr.sbin/fifolog/lib/fifolog_write_poll.c2
-rw-r--r--usr.sbin/fifolog/lib/libfifolog.h2
-rw-r--r--usr.sbin/fifolog/lib/libfifolog_int.h2
-rw-r--r--usr.sbin/fifolog/lib/miniobj.h2
-rw-r--r--usr.sbin/flowctl/flowctl.c2
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh2
-rw-r--r--usr.sbin/fstyp/befs.c2
-rwxr-xr-xusr.sbin/fstyp/tests/fstyp_test.sh2
-rw-r--r--usr.sbin/gpioctl/gpioctl.c2
-rw-r--r--usr.sbin/gssd/gssd.c2
-rw-r--r--usr.sbin/i2c/i2c.c2
-rw-r--r--usr.sbin/inetd/builtins.c2
-rw-r--r--usr.sbin/iscsid/discovery.c2
-rw-r--r--usr.sbin/iscsid/iscsid.c2
-rw-r--r--usr.sbin/iscsid/iscsid.h2
-rw-r--r--usr.sbin/iscsid/login.c2
-rw-r--r--usr.sbin/jail/command.c2
-rw-r--r--usr.sbin/jail/config.c2
-rw-r--r--usr.sbin/jail/jail.c2
-rw-r--r--usr.sbin/jail/jaillex.l2
-rw-r--r--usr.sbin/jail/jailp.h2
-rw-r--r--usr.sbin/jail/jailparse.y2
-rw-r--r--usr.sbin/jail/state.c2
-rwxr-xr-xusr.sbin/jail/tests/jail_basic_test.sh2
-rw-r--r--usr.sbin/jexec/jexec.c2
-rw-r--r--usr.sbin/jls/jls.c2
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c2
-rw-r--r--usr.sbin/kbdcontrol/lex.h2
-rw-r--r--usr.sbin/kbdcontrol/lex.l2
-rw-r--r--usr.sbin/kbdmap/kbdmap.c2
-rw-r--r--usr.sbin/kbdmap/kbdmap.h2
-rw-r--r--usr.sbin/kldxref/ef_amd64.c2
-rw-r--r--usr.sbin/kldxref/ef_i386.c2
-rw-r--r--usr.sbin/kldxref/ef_mips.c2
-rw-r--r--usr.sbin/kldxref/ef_nop.c2
-rw-r--r--usr.sbin/kldxref/ef_powerpc.c2
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.c2
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.h2
-rw-r--r--usr.sbin/lpr/common_source/ctlinfo.c2
-rw-r--r--usr.sbin/lpr/common_source/ctlinfo.h2
-rw-r--r--usr.sbin/lpr/common_source/lp.cdefs.h2
-rw-r--r--usr.sbin/lpr/common_source/matchjobs.c2
-rw-r--r--usr.sbin/lpr/common_source/matchjobs.h2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/koi2855.c2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c2
-rw-r--r--usr.sbin/lpr/lpc/movejobs.c2
-rw-r--r--usr.sbin/makefs/mtree.c2
-rw-r--r--usr.sbin/memcontrol/memcontrol.c2
-rw-r--r--usr.sbin/mfiutil/mfi_bbu.c2
-rw-r--r--usr.sbin/mfiutil/mfi_foreign.c2
-rw-r--r--usr.sbin/mfiutil/mfi_properties.c2
-rwxr-xr-xusr.sbin/mixer/tests/mixer_test.sh2
-rw-r--r--usr.sbin/mlxcontrol/command.c2
-rw-r--r--usr.sbin/mlxcontrol/config.c2
-rw-r--r--usr.sbin/mlxcontrol/interface.c2
-rw-r--r--usr.sbin/mlxcontrol/mlxcontrol.h2
-rw-r--r--usr.sbin/mlxcontrol/util.c2
-rw-r--r--usr.sbin/mptable/mptable.c2
-rw-r--r--usr.sbin/mtest/mtest.c2
-rw-r--r--usr.sbin/newsyslog/extern.h2
-rw-r--r--usr.sbin/pciconf/err.c2
-rw-r--r--usr.sbin/pkg/config.c2
-rw-r--r--usr.sbin/pkg/config.h2
-rw-r--r--usr.sbin/pkg/dns_utils.c2
-rw-r--r--usr.sbin/pkg/dns_utils.h2
-rw-r--r--usr.sbin/pkg/hash.c2
-rw-r--r--usr.sbin/pkg/hash.h2
-rw-r--r--usr.sbin/pkg/pkg.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc.h2
-rw-r--r--usr.sbin/pmc/cmd_pmc_filter.cc2
-rw-r--r--usr.sbin/pmc/cmd_pmc_list.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_stat.c2
-rw-r--r--usr.sbin/pmc/cmd_pmc_summary.cc2
-rw-r--r--usr.sbin/pmc/pmc.c2
-rw-r--r--usr.sbin/pmc/pmc_util.c2
-rw-r--r--usr.sbin/pmcannotate/pmcannotate.c2
-rw-r--r--usr.sbin/pmccontrol/pmccontrol.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_annotate_cg.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_callgraph.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_calltree.h2
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.c2
-rw-r--r--usr.sbin/pmcstat/pmcpl_gprof.h2
-rw-r--r--usr.sbin/pmcstat/pmcstat.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat.h2
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.c2
-rw-r--r--usr.sbin/pmcstat/pmcstat_log.h2
-rw-r--r--usr.sbin/pmcstat/pmcstat_top.h2
-rw-r--r--usr.sbin/pnfsdscopymr/pnfsdscopymr.c2
-rw-r--r--usr.sbin/pnfsdsfile/pnfsdsfile.c2
-rw-r--r--usr.sbin/pnfsdskill/pnfsdskill.c2
-rw-r--r--usr.sbin/portsnap/make_index/make_index.c2
-rw-r--r--usr.sbin/portsnap/portsnap/portsnap.sh2
-rw-r--r--usr.sbin/powerd/powerd.c2
-rw-r--r--usr.sbin/ppp/acf.c2
-rw-r--r--usr.sbin/ppp/acf.h2
-rw-r--r--usr.sbin/ppp/arp.h2
-rw-r--r--usr.sbin/ppp/async.c2
-rw-r--r--usr.sbin/ppp/async.h2
-rw-r--r--usr.sbin/ppp/auth.c2
-rw-r--r--usr.sbin/ppp/auth.h2
-rw-r--r--usr.sbin/ppp/bundle.c2
-rw-r--r--usr.sbin/ppp/bundle.h2
-rw-r--r--usr.sbin/ppp/cbcp.c2
-rw-r--r--usr.sbin/ppp/cbcp.h2
-rw-r--r--usr.sbin/ppp/ccp.c2
-rw-r--r--usr.sbin/ppp/ccp.h2
-rw-r--r--usr.sbin/ppp/chap.c2
-rw-r--r--usr.sbin/ppp/chap.h2
-rw-r--r--usr.sbin/ppp/chap_ms.c2
-rw-r--r--usr.sbin/ppp/chap_ms.h2
-rw-r--r--usr.sbin/ppp/chat.c2
-rw-r--r--usr.sbin/ppp/chat.h2
-rw-r--r--usr.sbin/ppp/command.c2
-rw-r--r--usr.sbin/ppp/command.h2
-rw-r--r--usr.sbin/ppp/datalink.c2
-rw-r--r--usr.sbin/ppp/datalink.h2
-rw-r--r--usr.sbin/ppp/deflate.c2
-rw-r--r--usr.sbin/ppp/deflate.h2
-rw-r--r--usr.sbin/ppp/defs.c2
-rw-r--r--usr.sbin/ppp/defs.h2
-rw-r--r--usr.sbin/ppp/descriptor.h2
-rw-r--r--usr.sbin/ppp/ether.c2
-rw-r--r--usr.sbin/ppp/ether.h2
-rw-r--r--usr.sbin/ppp/exec.c2
-rw-r--r--usr.sbin/ppp/exec.h2
-rw-r--r--usr.sbin/ppp/filter.c2
-rw-r--r--usr.sbin/ppp/filter.h2
-rw-r--r--usr.sbin/ppp/fsm.c2
-rw-r--r--usr.sbin/ppp/fsm.h2
-rw-r--r--usr.sbin/ppp/hdlc.c2
-rw-r--r--usr.sbin/ppp/hdlc.h2
-rw-r--r--usr.sbin/ppp/i4b.h2
-rw-r--r--usr.sbin/ppp/id.c2
-rw-r--r--usr.sbin/ppp/id.h2
-rw-r--r--usr.sbin/ppp/iface.c2
-rw-r--r--usr.sbin/ppp/iface.h2
-rw-r--r--usr.sbin/ppp/ip.c2
-rw-r--r--usr.sbin/ppp/ip.h2
-rw-r--r--usr.sbin/ppp/ipcp.c2
-rw-r--r--usr.sbin/ppp/ipcp.h2
-rw-r--r--usr.sbin/ppp/iplist.c2
-rw-r--r--usr.sbin/ppp/iplist.h2
-rw-r--r--usr.sbin/ppp/ipv6cp.c2
-rw-r--r--usr.sbin/ppp/ipv6cp.h2
-rw-r--r--usr.sbin/ppp/layer.h2
-rw-r--r--usr.sbin/ppp/lcp.c2
-rw-r--r--usr.sbin/ppp/lcp.h2
-rw-r--r--usr.sbin/ppp/link.c2
-rw-r--r--usr.sbin/ppp/link.h2
-rw-r--r--usr.sbin/ppp/log.c2
-rw-r--r--usr.sbin/ppp/log.h2
-rw-r--r--usr.sbin/ppp/lqr.c2
-rw-r--r--usr.sbin/ppp/lqr.h2
-rw-r--r--usr.sbin/ppp/main.c2
-rw-r--r--usr.sbin/ppp/main.h2
-rw-r--r--usr.sbin/ppp/mbuf.c2
-rw-r--r--usr.sbin/ppp/mbuf.h2
-rw-r--r--usr.sbin/ppp/mp.c2
-rw-r--r--usr.sbin/ppp/mp.h2
-rw-r--r--usr.sbin/ppp/mppe.c2
-rw-r--r--usr.sbin/ppp/mppe.h2
-rw-r--r--usr.sbin/ppp/nat_cmd.c2
-rw-r--r--usr.sbin/ppp/nat_cmd.h2
-rw-r--r--usr.sbin/ppp/ncp.c2
-rw-r--r--usr.sbin/ppp/ncp.h2
-rw-r--r--usr.sbin/ppp/ncpaddr.c2
-rw-r--r--usr.sbin/ppp/ncpaddr.h2
-rw-r--r--usr.sbin/ppp/netgraph.c2
-rw-r--r--usr.sbin/ppp/netgraph.h2
-rw-r--r--usr.sbin/ppp/pap.c2
-rw-r--r--usr.sbin/ppp/pap.h2
-rw-r--r--usr.sbin/ppp/pred.c2
-rw-r--r--usr.sbin/ppp/pred.h2
-rw-r--r--usr.sbin/ppp/probe.c2
-rw-r--r--usr.sbin/ppp/probe.h2
-rw-r--r--usr.sbin/ppp/prompt.c2
-rw-r--r--usr.sbin/ppp/prompt.h2
-rw-r--r--usr.sbin/ppp/proto.c2
-rw-r--r--usr.sbin/ppp/proto.h2
-rw-r--r--usr.sbin/ppp/radius.c2
-rw-r--r--usr.sbin/ppp/radius.h2
-rw-r--r--usr.sbin/ppp/route.c2
-rw-r--r--usr.sbin/ppp/route.h2
-rw-r--r--usr.sbin/ppp/server.c2
-rw-r--r--usr.sbin/ppp/server.h2
-rw-r--r--usr.sbin/ppp/sig.c2
-rw-r--r--usr.sbin/ppp/sig.h2
-rw-r--r--usr.sbin/ppp/sync.c2
-rw-r--r--usr.sbin/ppp/sync.h2
-rw-r--r--usr.sbin/ppp/systems.c2
-rw-r--r--usr.sbin/ppp/systems.h2
-rw-r--r--usr.sbin/ppp/tcp.c2
-rw-r--r--usr.sbin/ppp/tcp.h2
-rw-r--r--usr.sbin/ppp/tcpmss.c2
-rw-r--r--usr.sbin/ppp/tcpmss.h2
-rw-r--r--usr.sbin/ppp/throughput.c2
-rw-r--r--usr.sbin/ppp/throughput.h2
-rw-r--r--usr.sbin/ppp/timer.c2
-rw-r--r--usr.sbin/ppp/timer.h2
-rw-r--r--usr.sbin/ppp/tty.c2
-rw-r--r--usr.sbin/ppp/tty.h2
-rw-r--r--usr.sbin/ppp/tun.c2
-rw-r--r--usr.sbin/ppp/tun.h2
-rw-r--r--usr.sbin/ppp/ua.h2
-rw-r--r--usr.sbin/ppp/udp.c2
-rw-r--r--usr.sbin/ppp/udp.h2
-rw-r--r--usr.sbin/ppp/vjcomp.c2
-rw-r--r--usr.sbin/ppp/vjcomp.h2
-rw-r--r--usr.sbin/pppctl/pppctl.c2
-rw-r--r--usr.sbin/pw/bitmap.c2
-rw-r--r--usr.sbin/pw/bitmap.h2
-rw-r--r--usr.sbin/pw/cpdir.c2
-rw-r--r--usr.sbin/pw/grupd.c2
-rw-r--r--usr.sbin/pw/psdate.c2
-rw-r--r--usr.sbin/pw/psdate.h2
-rw-r--r--usr.sbin/pw/pw.c2
-rw-r--r--usr.sbin/pw/pw.h2
-rw-r--r--usr.sbin/pw/pw_conf.c2
-rw-r--r--usr.sbin/pw/pw_group.c2
-rw-r--r--usr.sbin/pw/pw_log.c2
-rw-r--r--usr.sbin/pw/pw_nis.c2
-rw-r--r--usr.sbin/pw/pw_user.c2
-rw-r--r--usr.sbin/pw/pw_vpw.c2
-rw-r--r--usr.sbin/pw/pwupd.c2
-rw-r--r--usr.sbin/pw/pwupd.h2
-rw-r--r--usr.sbin/pw/rm_r.c2
-rw-r--r--usr.sbin/pwm/pwm.c2
-rw-r--r--usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlscommon.c2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlscommon.h2
-rw-r--r--usr.sbin/rpc.tlsservd/rpc.tlsservd.c2
-rw-r--r--usr.sbin/rpc.umntall/mounttab.c2
-rw-r--r--usr.sbin/rpc.umntall/mounttab.h2
-rw-r--r--usr.sbin/rpc.umntall/rpc.umntall.c2
-rw-r--r--usr.sbin/rtadvctl/rtadvctl.c2
-rw-r--r--usr.sbin/rtadvd/advcap.h2
-rw-r--r--usr.sbin/rtadvd/control.c2
-rw-r--r--usr.sbin/rtadvd/control.h2
-rw-r--r--usr.sbin/rtadvd/control_client.c2
-rw-r--r--usr.sbin/rtadvd/control_client.h2
-rw-r--r--usr.sbin/rtadvd/control_server.c2
-rw-r--r--usr.sbin/rtadvd/control_server.h2
-rw-r--r--usr.sbin/sa/db.c2
-rwxr-xr-xusr.sbin/service/service.sh2
-rw-r--r--usr.sbin/setfmac/setfmac.c2
-rw-r--r--usr.sbin/smbmsg/pathnames.h2
-rw-r--r--usr.sbin/smbmsg/smbmsg.c2
-rw-r--r--usr.sbin/snapinfo/snapinfo.c2
-rw-r--r--usr.sbin/spkrtest/spkrtest.sh2
-rw-r--r--usr.sbin/syslogd/syslogd.c2
-rw-r--r--usr.sbin/traceroute/findsaddr-udp.c2
-rw-r--r--usr.sbin/trim/trim.c2
-rw-r--r--usr.sbin/uathload/uathload.c2
-rw-r--r--usr.sbin/uefisign/child.c2
-rw-r--r--usr.sbin/uefisign/magic.h2
-rw-r--r--usr.sbin/uefisign/pe.c2
-rw-r--r--usr.sbin/uefisign/uefisign.c2
-rw-r--r--usr.sbin/uefisign/uefisign.h2
-rw-r--r--usr.sbin/ugidfw/ugidfw.c2
-rw-r--r--usr.sbin/uhsoctl/uhsoctl.c2
-rwxr-xr-xusr.sbin/unbound/setup/local-unbound-setup.sh2
-rw-r--r--usr.sbin/usbconfig/dump.c2
-rw-r--r--usr.sbin/usbconfig/dump.h2
-rw-r--r--usr.sbin/usbconfig/usbconfig.c2
-rw-r--r--usr.sbin/usbdump/usbdump.c2
-rw-r--r--usr.sbin/utx/utx.c2
-rw-r--r--usr.sbin/wake/wake.c2
-rw-r--r--usr.sbin/watchdogd/watchdogd.c2
-rw-r--r--usr.sbin/wlandebug/wlandebug.c2
5438 files changed, 5440 insertions, 5440 deletions
diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh
index 559a5ecc3c00..42c173ccf089 100755
--- a/bin/cp/tests/cp_test.sh
+++ b/bin/cp/tests/cp_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1
index 843c6215cc80..60aaf72ffb15 100644
--- a/bin/timeout/timeout.1
+++ b/bin/timeout/timeout.1
@@ -1,4 +1,4 @@
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
.\" All rights reserved.
diff --git a/include/bitstring.h b/include/bitstring.h
index b179880f1e42..47f9a2d66741 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/include/complex.h b/include/complex.h
index c31c15d9da4b..9bc151e0c075 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2011 The FreeBSD Project.
* All rights reserved.
diff --git a/include/cpio.h b/include/cpio.h
index 9cbd44e16522..64ddb1e0f71b 100644
--- a/include/cpio.h
+++ b/include/cpio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/elf-hints.h b/include/elf-hints.h
index 679cc34e249e..e1ded3788a81 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 John D. Polstra.
* All rights reserved.
diff --git a/include/elf.h b/include/elf.h
index f230ae729fea..158167972888 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
diff --git a/include/fmtmsg.h b/include/fmtmsg.h
index 1251c95d489d..18c7fda5e0d8 100644
--- a/include/fmtmsg.h
+++ b/include/fmtmsg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/inttypes.h b/include/inttypes.h
index adf74e5a3e9d..75a2e0f5ba9f 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/iso646.h b/include/iso646.h
index a2ab46abf4e0..0b51e427ee81 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Alex Nash
* All rights reserved.
diff --git a/include/kenv.h b/include/kenv.h
index 0f5e8a92fa27..bdd2540cbe6e 100644
--- a/include/kenv.h
+++ b/include/kenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
diff --git a/include/langinfo.h b/include/langinfo.h
index 87273072a905..6dc3de5ccc55 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/include/malloc_np.h b/include/malloc_np.h
index 94c7026ef10f..4adcdc505e9c 100644
--- a/include/malloc_np.h
+++ b/include/malloc_np.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006 Jason Evans <jasone@FreeBSD.org>.
* All rights reserved.
diff --git a/include/mk-osreldate.sh b/include/mk-osreldate.sh
index 037a308fa826..e62ee1087b8f 100755
--- a/include/mk-osreldate.sh
+++ b/include/mk-osreldate.sh
@@ -1,5 +1,5 @@
#!/bin/sh -
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2013 Garrett Cooper
# All rights reserved.
diff --git a/include/monetary.h b/include/monetary.h
index d7b381b82042..36525f4489a3 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/include/mqueue.h b/include/mqueue.h
index 987cf0bd4e23..b194ab073ab1 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/include/nss.h b/include/nss.h
index 0cc155a0393c..9fd034561fa8 100644
--- a/include/nss.h
+++ b/include/nss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/include/printf.h b/include/printf.h
index 2a643f94c657..625ab354610c 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/include/proc_service.h b/include/proc_service.h
index 3b12ff949460..e5d75de13de6 100644
--- a/include/proc_service.h
+++ b/include/proc_service.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
diff --git a/include/rpc/rpcsec_gss.h b/include/rpc/rpcsec_gss.h
index 2878ae04b70d..6bd1fe6c697d 100644
--- a/include/rpc/rpcsec_gss.h
+++ b/include/rpc/rpcsec_gss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/include/semaphore.h b/include/semaphore.h
index f330d5142058..83b8949237a8 100644
--- a/include/semaphore.h
+++ b/include/semaphore.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 David Xu <davidxu@freebsd.org>
*
diff --git a/include/spawn.h b/include/spawn.h
index 53373a6c8db8..6f7abc724641 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/stdalign.h b/include/stdalign.h
index 6f777fde3df5..c9b5cfc63c5d 100644
--- a/include/stdalign.h
+++ b/include/stdalign.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/stdbool.h b/include/stdbool.h
index 2879da798da6..62067966a1dc 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
* All rights reserved.
diff --git a/include/stdnoreturn.h b/include/stdnoreturn.h
index e8fc7dca71b3..37bcb04e5b64 100644
--- a/include/stdnoreturn.h
+++ b/include/stdnoreturn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/strings.h b/include/strings.h
index 9df19e4ce9ce..337e02419437 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/include/tgmath.h b/include/tgmath.h
index bf7a61c5f320..8ee3835fe123 100644
--- a/include/tgmath.h
+++ b/include/tgmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder.
* All rights reserved.
diff --git a/include/uchar.h b/include/uchar.h
index a84a58b3a2dd..d518aedab451 100644
--- a/include/uchar.h
+++ b/include/uchar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/ulimit.h b/include/ulimit.h
index 2579a5201518..4c34c87836ac 100644
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Kyle Martin <mkm@ieee.org>
* All rights reserved.
diff --git a/include/utmpx.h b/include/utmpx.h
index b71d9638d81e..2f8faaade523 100644
--- a/include/utmpx.h
+++ b/include/utmpx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/uuid.h b/include/uuid.h
index 8056acaf7157..3c9deceab591 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/include/varargs.h b/include/varargs.h
index a5d59f46ddf1..6aa002c73ff3 100644
--- a/include/varargs.h
+++ b/include/varargs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Alexander Kabaev
* All rights reserved.
diff --git a/include/wordexp.h b/include/wordexp.h
index bda6ff542fb7..48beda5e63a3 100644
--- a/include/wordexp.h
+++ b/include/wordexp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/include/xlocale.h b/include/xlocale.h
index 647c43b315c9..1e6b89394363 100644
--- a/include/xlocale.h
+++ b/include/xlocale.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/include/xlocale/_ctype.h b/include/xlocale/_ctype.h
index 7d25eec25f0a..96e3fdd78c78 100644
--- a/include/xlocale/_ctype.h
+++ b/include/xlocale/_ctype.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/include/xlocale/_inttypes.h b/include/xlocale/_inttypes.h
index 35729139c71e..c4a116c78d55 100644
--- a/include/xlocale/_inttypes.h
+++ b/include/xlocale/_inttypes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_langinfo.h b/include/xlocale/_langinfo.h
index 6886ca335f22..98fed8a406ba 100644
--- a/include/xlocale/_langinfo.h
+++ b/include/xlocale/_langinfo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_locale.h b/include/xlocale/_locale.h
index d186b04ecd6d..491605006a4e 100644
--- a/include/xlocale/_locale.h
+++ b/include/xlocale/_locale.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_monetary.h b/include/xlocale/_monetary.h
index 13b1c3cc2a3d..ebe602a95283 100644
--- a/include/xlocale/_monetary.h
+++ b/include/xlocale/_monetary.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_stdio.h b/include/xlocale/_stdio.h
index d0df7931cfd0..9dce2d3665a1 100644
--- a/include/xlocale/_stdio.h
+++ b/include/xlocale/_stdio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_stdlib.h b/include/xlocale/_stdlib.h
index 380cbe0bdb1b..3480ac7b96e5 100644
--- a/include/xlocale/_stdlib.h
+++ b/include/xlocale/_stdlib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_string.h b/include/xlocale/_string.h
index 64b128df161d..2f509cd6064f 100644
--- a/include/xlocale/_string.h
+++ b/include/xlocale/_string.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_time.h b/include/xlocale/_time.h
index fe0057b0b15f..019a3b051e5e 100644
--- a/include/xlocale/_time.h
+++ b/include/xlocale/_time.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/include/xlocale/_uchar.h b/include/xlocale/_uchar.h
index 0c6ed09373f2..fb2429d13fe0 100644
--- a/include/xlocale/_uchar.h
+++ b/include/xlocale/_uchar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/include/xlocale/_wchar.h b/include/xlocale/_wchar.h
index 7ce562eb7c21..4ee80e2c8d61 100644
--- a/include/xlocale/_wchar.h
+++ b/include/xlocale/_wchar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2012 The FreeBSD Foundation
*
diff --git a/kerberos5/lib/libgssapi_krb5/gss_krb5.c b/kerberos5/lib/libgssapi_krb5/gss_krb5.c
index 94237e22376b..3da9452a4934 100644
--- a/kerberos5/lib/libgssapi_krb5/gss_krb5.c
+++ b/kerberos5/lib/libgssapi_krb5/gss_krb5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
index 0b19edcdc301..9c996479947e 100644
--- a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
+++ b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/kerberos5/lib/libgssapi_krb5/prefix.c b/kerberos5/lib/libgssapi_krb5/prefix.c
index 539ea93fa9c4..57e77f9d0f78 100644
--- a/kerberos5/lib/libgssapi_krb5/prefix.c
+++ b/kerberos5/lib/libgssapi_krb5/prefix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/kerberos5/lib/libgssapi_ntlm/prefix.c b/kerberos5/lib/libgssapi_ntlm/prefix.c
index f3e82f35a92a..b0e5eaee6096 100644
--- a/kerberos5/lib/libgssapi_ntlm/prefix.c
+++ b/kerberos5/lib/libgssapi_ntlm/prefix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/kerberos5/lib/libgssapi_spnego/freebsd_compat.c b/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
index 7abca22690ae..e19411f035d2 100644
--- a/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
+++ b/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/csu/amd64/crt1_c.c b/lib/csu/amd64/crt1_c.c
index f1c99de9ffe0..965d50608a7f 100644
--- a/lib/csu/amd64/crt1_c.c
+++ b/lib/csu/amd64/crt1_c.c
@@ -1,6 +1,6 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index 142ef56c2785..9ee16fbf66ed 100644
--- a/lib/csu/common/crtbrand.S
+++ b/lib/csu/common/crtbrand.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2000 David E. O'Brien, John D. Polstra.
* All rights reserved.
diff --git a/lib/csu/common/feature_note.S b/lib/csu/common/feature_note.S
index c2a6c94d1ee2..7f95f32e5f9f 100644
--- a/lib/csu/common/feature_note.S
+++ b/lib/csu/common/feature_note.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2000 David E. O'Brien, John D. Polstra.
* All rights reserved.
diff --git a/lib/flua/libjail/jail.3lua b/lib/flua/libjail/jail.3lua
index a0cb7ae1381e..de35b937deb0 100644
--- a/lib/flua/libjail/jail.3lua
+++ b/lib/flua/libjail/jail.3lua
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020, Ryan Moeller <freqlabs@FreeBSD.org>
.\"
diff --git a/lib/geom/cache/geom_cache.c b/lib/geom/cache/geom_cache.c
index 4e76da2ce7a8..dc40c89f1b02 100644
--- a/lib/geom/cache/geom_cache.c
+++ b/lib/geom/cache/geom_cache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/concat/geom_concat.c b/lib/geom/concat/geom_concat.c
index 801bea61cdfd..1d2ee27d5aaf 100644
--- a/lib/geom/concat/geom_concat.c
+++ b/lib/geom/concat/geom_concat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c
index 890a5955af3c..21ae110b074e 100644
--- a/lib/geom/eli/geom_eli.c
+++ b/lib/geom/eli/geom_eli.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2019 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/lib/geom/journal/geom_journal.c b/lib/geom/journal/geom_journal.c
index 2a174c6e5b1c..d362e482290e 100644
--- a/lib/geom/journal/geom_journal.c
+++ b/lib/geom/journal/geom_journal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/journal/geom_journal.h b/lib/geom/journal/geom_journal.h
index 6725fe04001a..d6e3b35938e0 100644
--- a/lib/geom/journal/geom_journal.h
+++ b/lib/geom/journal/geom_journal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/journal/geom_journal_ufs.c b/lib/geom/journal/geom_journal_ufs.c
index 324be1748261..abafde716ad7 100644
--- a/lib/geom/journal/geom_journal_ufs.c
+++ b/lib/geom/journal/geom_journal_ufs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/label/geom_label.c b/lib/geom/label/geom_label.c
index f51e87ecb57d..a8eb68de3bc0 100644
--- a/lib/geom/label/geom_label.c
+++ b/lib/geom/label/geom_label.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/mirror/geom_mirror.c b/lib/geom/mirror/geom_mirror.c
index 2b1860eb7548..4f91857b41a2 100644
--- a/lib/geom/mirror/geom_mirror.c
+++ b/lib/geom/mirror/geom_mirror.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/mountver/geom_mountver.c b/lib/geom/mountver/geom_mountver.c
index 91e895e77a38..12f3a9ec3cde 100644
--- a/lib/geom/mountver/geom_mountver.c
+++ b/lib/geom/mountver/geom_mountver.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
*
diff --git a/lib/geom/multipath/geom_multipath.c b/lib/geom/multipath/geom_multipath.c
index 12f194ff762d..6db46ba5a277 100644
--- a/lib/geom/multipath/geom_multipath.c
+++ b/lib/geom/multipath/geom_multipath.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Mathew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/nop/geom_nop.c b/lib/geom/nop/geom_nop.c
index 0ba78f8d76f2..5ed1219be8b1 100644
--- a/lib/geom/nop/geom_nop.c
+++ b/lib/geom/nop/geom_nop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/part/geom_part.c b/lib/geom/part/geom_part.c
index 2d8f02053a69..70eb83a66c97 100644
--- a/lib/geom/part/geom_part.c
+++ b/lib/geom/part/geom_part.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/geom/raid/geom_raid.c b/lib/geom/raid/geom_raid.c
index efb356f6a7e3..b761d13d1e9b 100644
--- a/lib/geom/raid/geom_raid.c
+++ b/lib/geom/raid/geom_raid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/raid3/geom_raid3.c b/lib/geom/raid3/geom_raid3.c
index 17d3187d5cf4..b14ba16092aa 100644
--- a/lib/geom/raid3/geom_raid3.c
+++ b/lib/geom/raid3/geom_raid3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/shsec/geom_shsec.c b/lib/geom/shsec/geom_shsec.c
index 308a53b7f9d3..29b78ec9af18 100644
--- a/lib/geom/shsec/geom_shsec.c
+++ b/lib/geom/shsec/geom_shsec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/stripe/geom_stripe.c b/lib/geom/stripe/geom_stripe.c
index 175ddada2e33..cbabcb9e77fa 100644
--- a/lib/geom/stripe/geom_stripe.c
+++ b/lib/geom/stripe/geom_stripe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/geom/virstor/geom_virstor.c b/lib/geom/virstor/geom_virstor.c
index 25ebdebbe7eb..9c7899ff6e05 100644
--- a/lib/geom/virstor/geom_virstor.c
+++ b/lib/geom/virstor/geom_virstor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ivan Voras <ivoras@freebsd.org>
*
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index 20230ca26adf..e571b8569fcb 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
diff --git a/lib/libbe/be.c b/lib/libbe/be.c
index 471a25e6304c..7de71dd1b23a 100644
--- a/lib/libbe/be.c
+++ b/lib/libbe/be.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
*
diff --git a/lib/libbe/be.h b/lib/libbe/be.h
index 87285f2d10af..d3324dab2014 100644
--- a/lib/libbe/be.h
+++ b/lib/libbe/be.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
*
diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c
index ec966bc85fb7..9f9010527b95 100644
--- a/lib/libbe/be_access.c
+++ b/lib/libbe/be_access.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/lib/libbe/be_error.c b/lib/libbe/be_error.c
index b625092addac..9093e8847dc4 100644
--- a/lib/libbe/be_error.c
+++ b/lib/libbe/be_error.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
*
diff --git a/lib/libbe/be_impl.h b/lib/libbe/be_impl.h
index 0b0f0db3cb5c..bc7c29661065 100644
--- a/lib/libbe/be_impl.h
+++ b/lib/libbe/be_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
*
diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c
index 81f3d46a7208..64a5e7de2956 100644
--- a/lib/libbe/be_info.c
+++ b/lib/libbe/be_info.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3
index 2989aa9daa5c..3eff8a49f6e8 100644
--- a/lib/libbe/libbe.3
+++ b/lib/libbe/libbe.3
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2017 Kyle Kneitinger
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/lib/libbe/tests/be_create.sh b/lib/libbe/tests/be_create.sh
index ef64628a4de8..35f760930790 100755
--- a/lib/libbe/tests/be_create.sh
+++ b/lib/libbe/tests/be_create.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Rob Wing
#
diff --git a/lib/libbe/tests/target_prog.c b/lib/libbe/tests/target_prog.c
index f51768a253da..c49cd0067605 100644
--- a/lib/libbe/tests/target_prog.c
+++ b/lib/libbe/tests/target_prog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Rob Wing
*
diff --git a/lib/libbluetooth/bluetooth.c b/lib/libbluetooth/bluetooth.c
index b9ab5cba990e..8bd816d7e561 100644
--- a/lib/libbluetooth/bluetooth.c
+++ b/lib/libbluetooth/bluetooth.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libbluetooth/bluetooth.h b/lib/libbluetooth/bluetooth.h
index 96a531cffa75..dee52c18a5de 100644
--- a/lib/libbluetooth/bluetooth.h
+++ b/lib/libbluetooth/bluetooth.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libbluetooth/dev.c b/lib/libbluetooth/dev.c
index b4c5e47ee392..38b63195e51f 100644
--- a/lib/libbluetooth/dev.c
+++ b/lib/libbluetooth/dev.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libbluetooth/hci.c b/lib/libbluetooth/hci.c
index 3a524cebc3ae..e4ecfc62b16b 100644
--- a/lib/libbluetooth/hci.c
+++ b/lib/libbluetooth/hci.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libbsdstat/bsdstat.c b/lib/libbsdstat/bsdstat.c
index 2e6eb25bfd8a..2029dba20a3f 100644
--- a/lib/libbsdstat/bsdstat.c
+++ b/lib/libbsdstat/bsdstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/lib/libbsdstat/bsdstat.h b/lib/libbsdstat/bsdstat.h
index 89e231a84983..6363fd4a7b39 100644
--- a/lib/libbsdstat/bsdstat.h
+++ b/lib/libbsdstat/bsdstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/lib/libc/aarch64/gen/_get_tp.c b/lib/libc/aarch64/gen/_get_tp.c
index ce51b400b542..ac383b104d66 100644
--- a/lib/libc/aarch64/gen/_get_tp.c
+++ b/lib/libc/aarch64/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/aarch64/static_tls.h b/lib/libc/aarch64/static_tls.h
index 78f6b50f0127..ddc4ba4f87e9 100644
--- a/lib/libc/aarch64/static_tls.h
+++ b/lib/libc/aarch64/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/amd64/_fpmath.h b/lib/libc/amd64/_fpmath.h
index 8be7b7dbaf7d..ef6b7cf7d45a 100644
--- a/lib/libc/amd64/_fpmath.h
+++ b/lib/libc/amd64/_fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/amd64/gen/_get_tp.c b/lib/libc/amd64/gen/_get_tp.c
index 3c74b9e769c1..355541cfe289 100644
--- a/lib/libc/amd64/gen/_get_tp.c
+++ b/lib/libc/amd64/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/amd64/gen/_set_tp.c b/lib/libc/amd64/gen/_set_tp.c
index 6e3a4c07499b..235a1f403e76 100644
--- a/lib/libc/amd64/gen/_set_tp.c
+++ b/lib/libc/amd64/gen/_set_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/amd64/gen/makecontext.c b/lib/libc/amd64/gen/makecontext.c
index 720b48b6a97d..05ceba7d9af9 100644
--- a/lib/libc/amd64/gen/makecontext.c
+++ b/lib/libc/amd64/gen/makecontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libc/amd64/gen/signalcontext.c b/lib/libc/amd64/gen/signalcontext.c
index a489a14b3012..283a9715e768 100644
--- a/lib/libc/amd64/gen/signalcontext.c
+++ b/lib/libc/amd64/gen/signalcontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libc/amd64/static_tls.h b/lib/libc/amd64/static_tls.h
index 1e9b76f58221..2f9c50fdc210 100644
--- a/lib/libc/amd64/static_tls.h
+++ b/lib/libc/amd64/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/amd64/string/strcpy.c b/lib/libc/amd64/string/strcpy.c
index df1facefb105..24161292de7f 100644
--- a/lib/libc/amd64/string/strcpy.c
+++ b/lib/libc/amd64/string/strcpy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2011 George V. Neville-Neil. All rights reserved.
*
diff --git a/lib/libc/amd64/sys/amd64_get_fsbase.c b/lib/libc/amd64/sys/amd64_get_fsbase.c
index 04d872165e32..751955a0cda4 100644
--- a/lib/libc/amd64/sys/amd64_get_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_fsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017, 2018 The FreeBSD Foundation
diff --git a/lib/libc/amd64/sys/amd64_get_gsbase.c b/lib/libc/amd64/sys/amd64_get_gsbase.c
index 35f69da6ac1e..85ebebb8ffae 100644
--- a/lib/libc/amd64/sys/amd64_get_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_get_gsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017, 2018 The FreeBSD Foundation
diff --git a/lib/libc/amd64/sys/amd64_set_fsbase.c b/lib/libc/amd64/sys/amd64_set_fsbase.c
index 9474b1148161..dae6fc4fdfea 100644
--- a/lib/libc/amd64/sys/amd64_set_fsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_fsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017, 2018 The FreeBSD Foundation
diff --git a/lib/libc/amd64/sys/amd64_set_gsbase.c b/lib/libc/amd64/sys/amd64_set_gsbase.c
index 5ecde27f27f0..6a7152c62a0a 100644
--- a/lib/libc/amd64/sys/amd64_set_gsbase.c
+++ b/lib/libc/amd64/sys/amd64_set_gsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2017, 2018 The FreeBSD Foundation
diff --git a/lib/libc/arm/_fpmath.h b/lib/libc/arm/_fpmath.h
index f5ae2f95ad28..1fe66b08968d 100644
--- a/lib/libc/arm/_fpmath.h
+++ b/lib/libc/arm/_fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/arm/aeabi/aeabi_atexit.c b/lib/libc/arm/aeabi/aeabi_atexit.c
index a33ca8f78af4..d3639ed17c11 100644
--- a/lib/libc/arm/aeabi/aeabi_atexit.c
+++ b/lib/libc/arm/aeabi/aeabi_atexit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
diff --git a/lib/libc/arm/aeabi/aeabi_double.c b/lib/libc/arm/aeabi/aeabi_double.c
index 0ec3e625c25c..e3eb9e539d73 100644
--- a/lib/libc/arm/aeabi/aeabi_double.c
+++ b/lib/libc/arm/aeabi/aeabi_double.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
diff --git a/lib/libc/arm/aeabi/aeabi_float.c b/lib/libc/arm/aeabi/aeabi_float.c
index 62f78495e844..de25334e590b 100644
--- a/lib/libc/arm/aeabi/aeabi_float.c
+++ b/lib/libc/arm/aeabi/aeabi_float.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
index 78b77c351cdb..74d81903f976 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Andrew Turner
* All rights reserved.
diff --git a/lib/libc/arm/gen/_get_tp.c b/lib/libc/arm/gen/_get_tp.c
index 7e0285f7d6f2..f4ec68161615 100644
--- a/lib/libc/arm/gen/_get_tp.c
+++ b/lib/libc/arm/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/arm/gen/_set_tp.c b/lib/libc/arm/gen/_set_tp.c
index d0801d7444ba..f07314424a39 100644
--- a/lib/libc/arm/gen/_set_tp.c
+++ b/lib/libc/arm/gen/_set_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/arm/gen/flt_rounds.c b/lib/libc/arm/gen/flt_rounds.c
index 17ca3fb9aa90..1947d4748ce9 100644
--- a/lib/libc/arm/gen/flt_rounds.c
+++ b/lib/libc/arm/gen/flt_rounds.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ian Lepore <freebsd@damnhippie.dyndns.org>
* All rights reserved.
diff --git a/lib/libc/arm/gen/getcontextx.c b/lib/libc/arm/gen/getcontextx.c
index 38a9a8abfe11..d857420c776a 100644
--- a/lib/libc/arm/gen/getcontextx.c
+++ b/lib/libc/arm/gen/getcontextx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/arm/gen/signalcontext.c b/lib/libc/arm/gen/signalcontext.c
index 7d17733c3c2c..2a6d76a1ccf2 100644
--- a/lib/libc/arm/gen/signalcontext.c
+++ b/lib/libc/arm/gen/signalcontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
diff --git a/lib/libc/arm/static_tls.h b/lib/libc/arm/static_tls.h
index e6be9adfcff6..73682000099f 100644
--- a/lib/libc/arm/static_tls.h
+++ b/lib/libc/arm/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/arm/sys/__vdso_gettc.c b/lib/libc/arm/sys/__vdso_gettc.c
index eff19118185b..6e373c0a81ab 100644
--- a/lib/libc/arm/sys/__vdso_gettc.c
+++ b/lib/libc/arm/sys/__vdso_gettc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 The FreeBSD Foundation
*
diff --git a/lib/libc/db/mpool/mpool-compat.c b/lib/libc/db/mpool/mpool-compat.c
index 08a111711641..be53ddc858e2 100644
--- a/lib/libc/db/mpool/mpool-compat.c
+++ b/lib/libc/db/mpool/mpool-compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Xin LI <delphij@FreeBSD.org>
*
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
index f1cf62977dd2..4a13a95a1ee7 100644
--- a/lib/libc/gdtoa/_hdtoa.c
+++ b/lib/libc/gdtoa/_hdtoa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gdtoa/_hldtoa.c b/lib/libc/gdtoa/_hldtoa.c
index 409c83adb285..0483609a7594 100644
--- a/lib/libc/gdtoa/_hldtoa.c
+++ b/lib/libc/gdtoa/_hldtoa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
index 0047f9d3e168..059b1a4ba8aa 100644
--- a/lib/libc/gdtoa/_ldtoa.c
+++ b/lib/libc/gdtoa/_ldtoa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gdtoa/machdep_ldisQ.c b/lib/libc/gdtoa/machdep_ldisQ.c
index a64f889b6e23..00795efa39cc 100644
--- a/lib/libc/gdtoa/machdep_ldisQ.c
+++ b/lib/libc/gdtoa/machdep_ldisQ.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gdtoa/machdep_ldisd.c b/lib/libc/gdtoa/machdep_ldisd.c
index 456d782a2a8a..fab7bdad43bb 100644
--- a/lib/libc/gdtoa/machdep_ldisd.c
+++ b/lib/libc/gdtoa/machdep_ldisd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gdtoa/machdep_ldisx.c b/lib/libc/gdtoa/machdep_ldisx.c
index ad918a03d52f..62c1d21f4be5 100644
--- a/lib/libc/gdtoa/machdep_ldisx.c
+++ b/lib/libc/gdtoa/machdep_ldisx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gen/__getosreldate.c b/lib/libc/gen/__getosreldate.c
index 938b1dc0e7f3..81fd125b2ee6 100644
--- a/lib/libc/gen/__getosreldate.c
+++ b/lib/libc/gen/__getosreldate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/gen/_once_stub.c b/lib/libc/gen/_once_stub.c
index 302f8536aec3..45ea4373299a 100644
--- a/lib/libc/gen/_once_stub.c
+++ b/lib/libc/gen/_once_stub.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
index fe5d704c3bb9..c0098aeeedd0 100644
--- a/lib/libc/gen/_pthread_stubs.c
+++ b/lib/libc/gen/_pthread_stubs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
* All rights reserved.
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
index 5778ad53f03f..5b5ab82f3cdd 100644
--- a/lib/libc/gen/_thread_init.c
+++ b/lib/libc/gen/_thread_init.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/arc4random-compat.c b/lib/libc/gen/arc4random-compat.c
index 065998e80553..3012b35a48f2 100644
--- a/lib/libc/gen/arc4random-compat.c
+++ b/lib/libc/gen/arc4random-compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Google LLC
* All rights reserved.
diff --git a/lib/libc/gen/auxv.c b/lib/libc/gen/auxv.c
index 29b3d6929144..d781948d4537 100644
--- a/lib/libc/gen/auxv.c
+++ b/lib/libc/gen/auxv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010, 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/lib/libc/gen/cap_sandboxed.c b/lib/libc/gen/cap_sandboxed.c
index fd16c4845dce..95fed05674ba 100644
--- a/lib/libc/gen/cap_sandboxed.c
+++ b/lib/libc/gen/cap_sandboxed.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/gen/clock_getcpuclockid.c b/lib/libc/gen/clock_getcpuclockid.c
index fe951392d3c6..1c2370c5973f 100644
--- a/lib/libc/gen/clock_getcpuclockid.c
+++ b/lib/libc/gen/clock_getcpuclockid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 David Xu <davidxu@FreeBSD.org>.
* All rights reserved.
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
index eda960f80a51..5a3f61fa921a 100644
--- a/lib/libc/gen/ctermid.c
+++ b/lib/libc/gen/ctermid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c
index 14fd3c8fc823..b103be6afdff 100644
--- a/lib/libc/gen/dirfd.c
+++ b/lib/libc/gen/dirfd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Gleb Kurtsou <gleb@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index 52e93d1476d7..61984e2fe86c 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
diff --git a/lib/libc/gen/dup3.c b/lib/libc/gen/dup3.c
index c091f3427738..b259d4402ce3 100644
--- a/lib/libc/gen/dup3.c
+++ b/lib/libc/gen/dup3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Jukka A. Ukkonen
* All rights reserved.
diff --git a/lib/libc/gen/elf_utils.c b/lib/libc/gen/elf_utils.c
index ed3ac843f7c3..907cd42026bb 100644
--- a/lib/libc/gen/elf_utils.c
+++ b/lib/libc/gen/elf_utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Konstantin Belousov <kib@freebsd.org>
* All rights reserved.
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
index 4ee9b6475655..82c40a86bb8e 100644
--- a/lib/libc/gen/errno.c
+++ b/lib/libc/gen/errno.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Peter Wemm <peter@freebsd.org>
* All rights reserved.
diff --git a/lib/libc/gen/fdevname.c b/lib/libc/gen/fdevname.c
index 217448fe2f59..d145c55718fa 100644
--- a/lib/libc/gen/fdevname.c
+++ b/lib/libc/gen/fdevname.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
index c5246561e0aa..0770aa7e5361 100644
--- a/lib/libc/gen/fmtmsg.c
+++ b/lib/libc/gen/fmtmsg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index 998656938936..e432204f2566 100644
--- a/lib/libc/gen/fpclassify.c
+++ b/lib/libc/gen/fpclassify.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index e65332a0bdde..14d9d0e57298 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 6ea7dadbdd0e..18499f16f641 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
* All rights reserved.
diff --git a/lib/libc/gen/getentropy.c b/lib/libc/gen/getentropy.c
index 2db3b8030243..7085e7c609f8 100644
--- a/lib/libc/gen/getentropy.c
+++ b/lib/libc/gen/getentropy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 3743518c8f58..746a69a3424b 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/gen/getpagesizes.c b/lib/libc/gen/getpagesizes.c
index b138f6a49158..40d4e67c02ae 100644
--- a/lib/libc/gen/getpagesizes.c
+++ b/lib/libc/gen/getpagesizes.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/lib/libc/gen/getpeereid.c b/lib/libc/gen/getpeereid.c
index 86396d359ba3..3690ae8fc50d 100644
--- a/lib/libc/gen/getpeereid.c
+++ b/lib/libc/gen/getpeereid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 634fc4fc8229..34afd76729e5 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/gen/getutxent.c b/lib/libc/gen/getutxent.c
index 664498126f13..b474009c48b5 100644
--- a/lib/libc/gen/getutxent.c
+++ b/lib/libc/gen/getutxent.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index ec62762c641a..6e679a2f7273 100644
--- a/lib/libc/gen/isinf.c
+++ b/lib/libc/gen/isinf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index ea84c7ebe403..4e24b9b55223 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/gen/libc_dlopen.c b/lib/libc/gen/libc_dlopen.c
index 5c386b649456..3548b41867f6 100644
--- a/lib/libc/gen/libc_dlopen.c
+++ b/lib/libc/gen/libc_dlopen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Xin LI <delphij@FreeBSD.org>
*
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c
index 7dc0ade5b309..1115741114dc 100644
--- a/lib/libc/gen/posix_spawn.c
+++ b/lib/libc/gen/posix_spawn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/pututxline.c b/lib/libc/gen/pututxline.c
index 45a9d3e95e59..f01c086950c1 100644
--- a/lib/libc/gen/pututxline.c
+++ b/lib/libc/gen/pututxline.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c
index a04926a950fe..8971a6f3aefa 100644
--- a/lib/libc/gen/sem.c
+++ b/lib/libc/gen/sem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 David Xu <davidxu@freebsd.org>.
* Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
diff --git a/lib/libc/gen/sem_new.c b/lib/libc/gen/sem_new.c
index 409f4ce76608..574d1da56d90 100644
--- a/lib/libc/gen/sem_new.c
+++ b/lib/libc/gen/sem_new.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
index 8760d76a82fa..e7985b29dd1e 100644
--- a/lib/libc/gen/semctl.c
+++ b/lib/libc/gen/semctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
index 86e02e98f9e3..4d66214a3b20 100644
--- a/lib/libc/gen/sysctlnametomib.c
+++ b/lib/libc/gen/sysctlnametomib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2001 The FreeBSD Project. All Rights Reserved.
*
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index 74b2ae562c99..edcb47c1b768 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
index c9602491cc20..be207083f39d 100644
--- a/lib/libc/gen/ulimit.c
+++ b/lib/libc/gen/ulimit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Kyle Martin <mkm@ieee.org>
* All rights reserved.
diff --git a/lib/libc/gen/unvis-compat.c b/lib/libc/gen/unvis-compat.c
index 2249f847621e..22afbdd104e1 100644
--- a/lib/libc/gen/unvis-compat.c
+++ b/lib/libc/gen/unvis-compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 SRI International
* All rights reserved.
diff --git a/lib/libc/gen/utxdb.c b/lib/libc/gen/utxdb.c
index 3edccdbd2c2f..130d5e718e3f 100644
--- a/lib/libc/gen/utxdb.c
+++ b/lib/libc/gen/utxdb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/utxdb.h b/lib/libc/gen/utxdb.h
index 912dd0fa113e..48a49a368db6 100644
--- a/lib/libc/gen/utxdb.h
+++ b/lib/libc/gen/utxdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/gen/waitid.c b/lib/libc/gen/waitid.c
index b9a8c577150a..0210be75eeab 100644
--- a/lib/libc/gen/waitid.c
+++ b/lib/libc/gen/waitid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Jukka A. Ukkonen
* All rights reserved.
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
index 0322c1176d69..e22535502860 100644
--- a/lib/libc/gen/wordexp.c
+++ b/lib/libc/gen/wordexp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/i386/_fpmath.h b/lib/libc/i386/_fpmath.h
index 874439c34b76..c912d036167a 100644
--- a/lib/libc/i386/_fpmath.h
+++ b/lib/libc/i386/_fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/i386/gen/_get_tp.c b/lib/libc/i386/gen/_get_tp.c
index f96695247928..8c9b7bfcf380 100644
--- a/lib/libc/i386/gen/_get_tp.c
+++ b/lib/libc/i386/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/i386/gen/_set_tp.c b/lib/libc/i386/gen/_set_tp.c
index 2da48988eb37..7fc85cdabab3 100644
--- a/lib/libc/i386/gen/_set_tp.c
+++ b/lib/libc/i386/gen/_set_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c
index 19258460ac44..4a27116f3c04 100644
--- a/lib/libc/i386/gen/makecontext.c
+++ b/lib/libc/i386/gen/makecontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/lib/libc/i386/gen/signalcontext.c b/lib/libc/i386/gen/signalcontext.c
index 35487093a869..24390a35e4b4 100644
--- a/lib/libc/i386/gen/signalcontext.c
+++ b/lib/libc/i386/gen/signalcontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Jonathan Mini <mini@freebsd.org>
* All rights reserved.
diff --git a/lib/libc/i386/static_tls.h b/lib/libc/i386/static_tls.h
index b0685d2e0f80..478982a61143 100644
--- a/lib/libc/i386/static_tls.h
+++ b/lib/libc/i386/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c
index 885ed7ddc398..9dc1f5a1e0b4 100644
--- a/lib/libc/i386/sys/i386_clr_watch.c
+++ b/lib/libc/i386/sys/i386_clr_watch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2000 Brian S. Dean <bsd@bsdhome.com>
* All Rights Reserved.
diff --git a/lib/libc/i386/sys/i386_get_fsbase.c b/lib/libc/i386/sys/i386_get_fsbase.c
index 973dea2c31ee..6adf7e2b1828 100644
--- a/lib/libc/i386/sys/i386_get_fsbase.c
+++ b/lib/libc/i386/sys/i386_get_fsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/i386/sys/i386_get_gsbase.c b/lib/libc/i386/sys/i386_get_gsbase.c
index 908a15eed24c..1e8f3c8008eb 100644
--- a/lib/libc/i386/sys/i386_get_gsbase.c
+++ b/lib/libc/i386/sys/i386_get_gsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
index 1bdabb2794f0..98aef11aa9d2 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/lib/libc/i386/sys/i386_set_fsbase.c b/lib/libc/i386/sys/i386_set_fsbase.c
index daa14591fce6..9ddfe9249fd7 100644
--- a/lib/libc/i386/sys/i386_set_fsbase.c
+++ b/lib/libc/i386/sys/i386_set_fsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/i386/sys/i386_set_gsbase.c b/lib/libc/i386/sys/i386_set_gsbase.c
index ffb435244b44..c4542bc4a9b0 100644
--- a/lib/libc/i386/sys/i386_set_gsbase.c
+++ b/lib/libc/i386/sys/i386_set_gsbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index a18336841b83..a5f912780406 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c
index 181df83ea2a8..e1ccc80eab2e 100644
--- a/lib/libc/i386/sys/i386_set_watch.c
+++ b/lib/libc/i386/sys/i386_set_watch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2000 Brian S. Dean <bsd@bsdhome.com>
* All Rights Reserved.
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index 90d90242d4a0..fac3f49aa69f 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
diff --git a/lib/libc/iconv/__iconv.c b/lib/libc/iconv/__iconv.c
index 9fd0567087a2..80aa1fdf8cff 100644
--- a/lib/libc/iconv/__iconv.c
+++ b/lib/libc/iconv/__iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/__iconv_free_list.c b/lib/libc/iconv/__iconv_free_list.c
index 0f2b92355e32..9cce716c3e39 100644
--- a/lib/libc/iconv/__iconv_free_list.c
+++ b/lib/libc/iconv/__iconv_free_list.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/__iconv_get_list.c b/lib/libc/iconv/__iconv_get_list.c
index cb80ed78ef48..9d86aa1acd15 100644
--- a/lib/libc/iconv/__iconv_get_list.c
+++ b/lib/libc/iconv/__iconv_get_list.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/citrus_lock.h b/lib/libc/iconv/citrus_lock.h
index 3daaf1c31dd0..f49b338a6d63 100644
--- a/lib/libc/iconv/citrus_lock.h
+++ b/lib/libc/iconv/citrus_lock.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Gabor Kovesdan <gabor@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/iconv/iconv-internal.h b/lib/libc/iconv/iconv-internal.h
index 731b6856ca22..35d1e87ceb60 100644
--- a/lib/libc/iconv/iconv-internal.h
+++ b/lib/libc/iconv/iconv-internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c
index 57c614029df0..59c46c7c73ac 100644
--- a/lib/libc/iconv/iconv.c
+++ b/lib/libc/iconv/iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv_canonicalize.c b/lib/libc/iconv/iconv_canonicalize.c
index 7c3e6f0fdbae..1efa032022b7 100644
--- a/lib/libc/iconv/iconv_canonicalize.c
+++ b/lib/libc/iconv/iconv_canonicalize.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv_close.c b/lib/libc/iconv/iconv_close.c
index f7d0231afcd8..af1107c2f770 100644
--- a/lib/libc/iconv/iconv_close.c
+++ b/lib/libc/iconv/iconv_close.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv_compat.c b/lib/libc/iconv/iconv_compat.c
index 2a6a120aa2cd..7c3871bd0345 100644
--- a/lib/libc/iconv/iconv_compat.c
+++ b/lib/libc/iconv/iconv_compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv_open.c b/lib/libc/iconv/iconv_open.c
index a386f13007b1..033e4c5ec880 100644
--- a/lib/libc/iconv/iconv_open.c
+++ b/lib/libc/iconv/iconv_open.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv_open_into.c b/lib/libc/iconv/iconv_open_into.c
index 9db00c3e7710..899c47eba542 100644
--- a/lib/libc/iconv/iconv_open_into.c
+++ b/lib/libc/iconv/iconv_open_into.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconv_set_relocation_prefix.c b/lib/libc/iconv/iconv_set_relocation_prefix.c
index 969381c12984..b5b5474b9412 100644
--- a/lib/libc/iconv/iconv_set_relocation_prefix.c
+++ b/lib/libc/iconv/iconv_set_relocation_prefix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconvctl.c b/lib/libc/iconv/iconvctl.c
index d6357f637752..d7cc56ef712f 100644
--- a/lib/libc/iconv/iconvctl.c
+++ b/lib/libc/iconv/iconvctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/iconv/iconvlist.c b/lib/libc/iconv/iconvlist.c
index dbd0a1eddf99..eac1ca00cfc7 100644
--- a/lib/libc/iconv/iconvlist.c
+++ b/lib/libc/iconv/iconvlist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libc/include/compat.h b/lib/libc/include/compat.h
index e6bc2e7a6612..7fb04ee5c220 100644
--- a/lib/libc/include/compat.h
+++ b/lib/libc/include/compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/lib/libc/include/errlst.h b/lib/libc/include/errlst.h
index 99492f840da5..4a52e0b523d9 100644
--- a/lib/libc/include/errlst.h
+++ b/lib/libc/include/errlst.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Jilles Tjoelker
* All rights reserved.
diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h
index ce935eb403e2..9d06fa593d51 100644
--- a/lib/libc/include/fpmath.h
+++ b/lib/libc/include/fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2002 David Schultz <das@FreeBSD.ORG>
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index d0c26ee581e3..017660d97270 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
* All rights reserved.
diff --git a/lib/libc/include/nscache.h b/lib/libc/include/nscache.h
index 8e79fa8eab6d..26406f3255d8 100644
--- a/lib/libc/include/nscache.h
+++ b/lib/libc/include/nscache.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
diff --git a/lib/libc/include/nscachedcli.h b/lib/libc/include/nscachedcli.h
index 4feed2b14208..5545756a2d30 100644
--- a/lib/libc/include/nscachedcli.h
+++ b/lib/libc/include/nscachedcli.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
diff --git a/lib/libc/include/nss_tls.h b/lib/libc/include/nss_tls.h
index 16b27c04ac1c..18ee23b4288c 100644
--- a/lib/libc/include/nss_tls.h
+++ b/lib/libc/include/nss_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
index 690f4ef1b9aa..2beea8913ad8 100644
--- a/lib/libc/include/reentrant.h
+++ b/lib/libc/include/reentrant.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997,98 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
index 8d05ab90c7dc..e597f93d3333 100644
--- a/lib/libc/include/un-namespace.h
+++ b/lib/libc/include/un-namespace.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
* All rights reserved.
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index a695da477d58..4da1b9983dae 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/c16rtomb.c b/lib/libc/locale/c16rtomb.c
index 46b930786592..ea94cbaed1b8 100644
--- a/lib/libc/locale/c16rtomb.c
+++ b/lib/libc/locale/c16rtomb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/c32rtomb.c b/lib/libc/locale/c32rtomb.c
index ebd671a404cc..677c79fa1cd8 100644
--- a/lib/libc/locale/c32rtomb.c
+++ b/lib/libc/locale/c32rtomb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/cXXrtomb_iconv.h b/lib/libc/locale/cXXrtomb_iconv.h
index 1f87e353e052..6ed32e1042d1 100644
--- a/lib/libc/locale/cXXrtomb_iconv.h
+++ b/lib/libc/locale/cXXrtomb_iconv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index c3b66e1f0534..4f3b1b51b9f6 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 9983cdbd969d..31f13d1f9602 100644
--- a/lib/libc/locale/collate.h
+++ b/lib/libc/locale/collate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index b444ea0652ac..fc11af70d067 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/lib/libc/locale/ctype.c b/lib/libc/locale/ctype.c
index 8a88b8d6512e..6e41130ea98c 100644
--- a/lib/libc/locale/ctype.c
+++ b/lib/libc/locale/ctype.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
index d15faef80781..cf1fa6104008 100644
--- a/lib/libc/locale/fix_grouping.c
+++ b/lib/libc/locale/fix_grouping.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
index b4f80678d840..8969857fd23e 100644
--- a/lib/libc/locale/gb18030.c
+++ b/lib/libc/locale/gb18030.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
index 07a6c4764bb3..dfebcb09a949 100644
--- a/lib/libc/locale/gb2312.c
+++ b/lib/libc/locale/gb2312.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index 889291cf3168..2a7d39aa8429 100644
--- a/lib/libc/locale/ldpart.c
+++ b/lib/libc/locale/ldpart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/ldpart.h b/lib/libc/locale/ldpart.h
index 8985b324ae03..c768f695c699 100644
--- a/lib/libc/locale/ldpart.h
+++ b/lib/libc/locale/ldpart.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c
index 70de30650346..ae0594ee22b7 100644
--- a/lib/libc/locale/lmessages.c
+++ b/lib/libc/locale/lmessages.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/lmessages.h b/lib/libc/locale/lmessages.h
index 0e8278f4a650..680694892c87 100644
--- a/lib/libc/locale/lmessages.h
+++ b/lib/libc/locale/lmessages.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c
index cdf4af79c3ab..b664f1cd26b5 100644
--- a/lib/libc/locale/lmonetary.c
+++ b/lib/libc/locale/lmonetary.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/lmonetary.h b/lib/libc/locale/lmonetary.h
index 69facf9f88dd..25ba84a55c64 100644
--- a/lib/libc/locale/lmonetary.h
+++ b/lib/libc/locale/lmonetary.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c
index 86b788d315ee..d4b8a596f5bf 100644
--- a/lib/libc/locale/lnumeric.c
+++ b/lib/libc/locale/lnumeric.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/lnumeric.h b/lib/libc/locale/lnumeric.h
index 43ff16127862..03b4b0f67063 100644
--- a/lib/libc/locale/lnumeric.h
+++ b/lib/libc/locale/lnumeric.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
index 77d9745da198..bc6141580c0d 100644
--- a/lib/libc/locale/mblen.c
+++ b/lib/libc/locale/mblen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
index 1fb5902a8d11..72e6904a78a7 100644
--- a/lib/libc/locale/mblocal.h
+++ b/lib/libc/locale/mblocal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index 4f687e98628f..a949b150d3b1 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/mbrtoc16.c b/lib/libc/locale/mbrtoc16.c
index 7f5674d97d3c..105e6e867c23 100644
--- a/lib/libc/locale/mbrtoc16.c
+++ b/lib/libc/locale/mbrtoc16.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/mbrtoc32.c b/lib/libc/locale/mbrtoc32.c
index 1238ca228b20..0a030bba1c81 100644
--- a/lib/libc/locale/mbrtoc32.c
+++ b/lib/libc/locale/mbrtoc32.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/mbrtocXX_iconv.h b/lib/libc/locale/mbrtocXX_iconv.h
index d753b3523244..4ebb56832660 100644
--- a/lib/libc/locale/mbrtocXX_iconv.h
+++ b/lib/libc/locale/mbrtocXX_iconv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
index 7585ef16bca2..2dc3f026e8d0 100644
--- a/lib/libc/locale/mbrtowc.c
+++ b/lib/libc/locale/mbrtowc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
index a7df81911b26..b53034068457 100644
--- a/lib/libc/locale/mbsinit.c
+++ b/lib/libc/locale/mbsinit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/mbsnrtowcs.c b/lib/libc/locale/mbsnrtowcs.c
index 69e48eafdc57..b800a3f065b6 100644
--- a/lib/libc/locale/mbsnrtowcs.c
+++ b/lib/libc/locale/mbsnrtowcs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index e85b22b492bf..576a3f9c00c4 100644
--- a/lib/libc/locale/mbsrtowcs.c
+++ b/lib/libc/locale/mbsrtowcs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
index 3226d22ea254..d177abe70efd 100644
--- a/lib/libc/locale/mbstowcs.c
+++ b/lib/libc/locale/mbstowcs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index ec634807560d..47e8f1b95392 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
index 3ef73ddec7b6..15b27a19b118 100644
--- a/lib/libc/locale/nextwctype.c
+++ b/lib/libc/locale/nextwctype.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index b51b0425515b..db35d6d50626 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/locale/rpmatch.c b/lib/libc/locale/rpmatch.c
index e4c366a00afb..1189f97e58ba 100644
--- a/lib/libc/locale/rpmatch.c
+++ b/lib/libc/locale/rpmatch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/runefile.h b/lib/libc/locale/runefile.h
index 18a603c03e31..a2c2f4b60d26 100644
--- a/lib/libc/locale/runefile.h
+++ b/lib/libc/locale/runefile.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ruslan Ermilov
* All rights reserved.
diff --git a/lib/libc/locale/setlocale.h b/lib/libc/locale/setlocale.h
index c199cdf62daf..9ae65f7467ba 100644
--- a/lib/libc/locale/setlocale.h
+++ b/lib/libc/locale/setlocale.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 13f957989fa2..84dd05378832 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
index fa5c08474475..00907061c2d8 100644
--- a/lib/libc/locale/wcrtomb.c
+++ b/lib/libc/locale/wcrtomb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
index 772c96c2f9f4..def5e7732673 100644
--- a/lib/libc/locale/wcsftime.c
+++ b/lib/libc/locale/wcsftime.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/locale/wcsnrtombs.c b/lib/libc/locale/wcsnrtombs.c
index 7fdbfc75156d..c0b38c9721ca 100644
--- a/lib/libc/locale/wcsnrtombs.c
+++ b/lib/libc/locale/wcsnrtombs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
index 1466eab7046d..b5f6291ef490 100644
--- a/lib/libc/locale/wcsrtombs.c
+++ b/lib/libc/locale/wcsrtombs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
index 42d8acdafcdb..3ea9a4c4e1b1 100644
--- a/lib/libc/locale/wcstod.c
+++ b/lib/libc/locale/wcstod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
index 34117557ee0f..8e57c0106331 100644
--- a/lib/libc/locale/wcstof.c
+++ b/lib/libc/locale/wcstof.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
index c31f84118a2f..55a911b229db 100644
--- a/lib/libc/locale/wcstold.c
+++ b/lib/libc/locale/wcstold.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
index a34b58ecdb05..f9eba5be44f7 100644
--- a/lib/libc/locale/wcstombs.c
+++ b/lib/libc/locale/wcstombs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index b43761c48d45..8dba3beba104 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
index 820021a3e0ab..2d84eb7880bb 100644
--- a/lib/libc/locale/wctomb.c
+++ b/lib/libc/locale/wctomb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/wctrans.c b/lib/libc/locale/wctrans.c
index 36cb25e45549..346e8ba6519d 100644
--- a/lib/libc/locale/wctrans.c
+++ b/lib/libc/locale/wctrans.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
index dd8f218306b2..2f729cb9edc5 100644
--- a/lib/libc/locale/wctype.c
+++ b/lib/libc/locale/wctype.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/locale/xlocale.c b/lib/libc/locale/xlocale.c
index 4bddc43c086b..a0aa8597fc81 100644
--- a/lib/libc/locale/xlocale.c
+++ b/lib/libc/locale/xlocale.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/locale/xlocale_private.h b/lib/libc/locale/xlocale_private.h
index bc40f28fc9eb..7ea52be2bb52 100644
--- a/lib/libc/locale/xlocale_private.h
+++ b/lib/libc/locale/xlocale_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/mips/_fpmath.h b/lib/libc/mips/_fpmath.h
index cece2fa81cb6..cc3b4d981c29 100644
--- a/lib/libc/mips/_fpmath.h
+++ b/lib/libc/mips/_fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/mips/gen/_get_tp.c b/lib/libc/mips/gen/_get_tp.c
index 45c5f8f35d42..447f3e020ff9 100644
--- a/lib/libc/mips/gen/_get_tp.c
+++ b/lib/libc/mips/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/mips/gen/_set_tp.c b/lib/libc/mips/gen/_set_tp.c
index d20a55149a53..65950b7677a5 100644
--- a/lib/libc/mips/gen/_set_tp.c
+++ b/lib/libc/mips/gen/_set_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/mips/gen/signalcontext.c b/lib/libc/mips/gen/signalcontext.c
index 7870a1efede8..c7bb9cfc7ed4 100644
--- a/lib/libc/mips/gen/signalcontext.c
+++ b/lib/libc/mips/gen/signalcontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
diff --git a/lib/libc/mips/static_tls.h b/lib/libc/mips/static_tls.h
index b823a34eaf8b..47257fa58b9f 100644
--- a/lib/libc/mips/static_tls.h
+++ b/lib/libc/mips/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index edc0a092ae10..dcf2844aa843 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994, Garrett Wollman
*
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index 2da8024c47f4..bfad0d22c935 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994, Garrett Wollman
*
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
index 92a032f9f2ee..1c54c554882c 100644
--- a/lib/libc/net/getifmaddrs.c
+++ b/lib/libc/net/getifmaddrs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Bruce M. Simpson.
* All rights reserved
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index 48407eb12b29..f6a2714ba986 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994, Garrett Wollman
*
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 82ff089c1f1b..0d9ec0885582 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994, Garrett Wollman
*
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
index 9f2bde221c92..415cd32b6ffd 100644
--- a/lib/libc/net/netdb_private.h
+++ b/lib/libc/net/netdb_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 The FreeBSD Project. All rights reserved.
*
diff --git a/lib/libc/net/nscache.c b/lib/libc/net/nscache.c
index e9954386b24f..2fd0857548d7 100644
--- a/lib/libc/net/nscache.c
+++ b/lib/libc/net/nscache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
diff --git a/lib/libc/net/nscachedcli.c b/lib/libc/net/nscachedcli.c
index 2acc12af2d1e..c9518214f5c5 100644
--- a/lib/libc/net/nscachedcli.c
+++ b/lib/libc/net/nscachedcli.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
* All rights reserved.
diff --git a/lib/libc/net/nss_backends.h b/lib/libc/net/nss_backends.h
index 0ec803220ada..764e7d02b86e 100644
--- a/lib/libc/net/nss_backends.h
+++ b/lib/libc/net/nss_backends.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/net/nss_compat.c b/lib/libc/net/nss_compat.c
index 110cd66090d6..a471fbd2f5db 100644
--- a/lib/libc/net/nss_compat.c
+++ b/lib/libc/net/nss_compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/net/ntoh.c b/lib/libc/net/ntoh.c
index 7b2bf9edc113..41432f8e88a8 100644
--- a/lib/libc/net/ntoh.c
+++ b/lib/libc/net/ntoh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
diff --git a/lib/libc/net/sockatmark.c b/lib/libc/net/sockatmark.c
index f56304359a76..c07741b155a6 100644
--- a/lib/libc/net/sockatmark.c
+++ b/lib/libc/net/sockatmark.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 William C. Fenner. All rights reserved.
*
diff --git a/lib/libc/net/sourcefilter.c b/lib/libc/net/sourcefilter.c
index 9bfb72d84504..6cd623249d13 100644
--- a/lib/libc/net/sourcefilter.c
+++ b/lib/libc/net/sourcefilter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Bruce Simpson.
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_branding.c b/lib/libc/posix1e/acl_branding.c
index 3a1254443526..fad59f4cd211 100644
--- a/lib/libc/posix1e/acl_branding.c
+++ b/lib/libc/posix1e/acl_branding.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index 7089df7d46e0..d48c0acdffeb 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_compat.c b/lib/libc/posix1e/acl_compat.c
index d41503f6787b..7980d1b9236b 100644
--- a/lib/libc/posix1e/acl_compat.c
+++ b/lib/libc/posix1e/acl_compat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 12af1fa7a449..c38cc7d268f4 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index 5867196e4373..92d22d641e3b 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 189669ad7530..26504bce7a02 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index 221aa7d24a3e..44eb8291f09e 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_flag.c b/lib/libc/posix1e/acl_flag.c
index 007d17e0aa65..470aff18417f 100644
--- a/lib/libc/posix1e/acl_flag.c
+++ b/lib/libc/posix1e/acl_flag.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index 49d6b722d2a9..869734acd2f2 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index 7cd45a7d6d25..5a1bcfc4a1f6 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_from_text_nfs4.c b/lib/libc/posix1e/acl_from_text_nfs4.c
index bb170cec74cd..a8b8b49e1c12 100644
--- a/lib/libc/posix1e/acl_from_text_nfs4.c
+++ b/lib/libc/posix1e/acl_from_text_nfs4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 6031199e58e7..73796f762ecf 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_id_to_name.c b/lib/libc/posix1e/acl_id_to_name.c
index c9a259716f07..8e7d9e99054f 100644
--- a/lib/libc/posix1e/acl_id_to_name.c
+++ b/lib/libc/posix1e/acl_id_to_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001, 2008 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index f26ef7e705b7..2b08d5efa7f8 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index 0fe28a49e30a..606fe7823f24 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Chris D. Faulhaber
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index d064d642838d..1186cbb8ec17 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
index e337530d8b22..b5085692028e 100644
--- a/lib/libc/posix1e/acl_strip.c
+++ b/lib/libc/posix1e/acl_strip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Chris D. Faulhaber
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index bb09d119f988..a7233a0403ff 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001, 2008 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_support.h b/lib/libc/posix1e/acl_support.h
index 87692153c4ee..c448a2557b8c 100644
--- a/lib/libc/posix1e/acl_support.h
+++ b/lib/libc/posix1e/acl_support.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_support_nfs4.c b/lib/libc/posix1e/acl_support_nfs4.c
index 92ec666b2313..9b55d78d82ec 100644
--- a/lib/libc/posix1e/acl_support_nfs4.c
+++ b/lib/libc/posix1e/acl_support_nfs4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index 009ceaceabf6..ce18702b0911 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2002 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/acl_to_text_nfs4.c b/lib/libc/posix1e/acl_to_text_nfs4.c
index 98f5124638d8..74876c3c7463 100644
--- a/lib/libc/posix1e/acl_to_text_nfs4.c
+++ b/lib/libc/posix1e/acl_to_text_nfs4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index 2be16dc5cc0d..24b3292a0970 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index a1be7fcc1b8f..973530e809b8 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index a8e0abe7afff..c9ba29676df1 100644
--- a/lib/libc/posix1e/mac.c
+++ b/lib/libc/posix1e/mac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
index 72148eedea4c..a3dc62c16f01 100644
--- a/lib/libc/posix1e/mac_exec.c
+++ b/lib/libc/posix1e/mac_exec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libc/powerpc/_fpmath.h b/lib/libc/powerpc/_fpmath.h
index 76eaa1eff089..be99da8f05d8 100644
--- a/lib/libc/powerpc/_fpmath.h
+++ b/lib/libc/powerpc/_fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/powerpc/gen/_get_tp.c b/lib/libc/powerpc/gen/_get_tp.c
index 0d08b707ff1a..641a6bfe5ffa 100644
--- a/lib/libc/powerpc/gen/_get_tp.c
+++ b/lib/libc/powerpc/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/powerpc/gen/_set_tp.c b/lib/libc/powerpc/gen/_set_tp.c
index 61986f21c697..9d6a9bdc8ea0 100644
--- a/lib/libc/powerpc/gen/_set_tp.c
+++ b/lib/libc/powerpc/gen/_set_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/powerpc/gen/makecontext.c b/lib/libc/powerpc/gen/makecontext.c
index c6625b4c1c90..5ab0309adcc9 100644
--- a/lib/libc/powerpc/gen/makecontext.c
+++ b/lib/libc/powerpc/gen/makecontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Suleiman Souhlal
* All rights reserved.
diff --git a/lib/libc/powerpc/gen/signalcontext.c b/lib/libc/powerpc/gen/signalcontext.c
index 88975593db6c..1839b7505df7 100644
--- a/lib/libc/powerpc/gen/signalcontext.c
+++ b/lib/libc/powerpc/gen/signalcontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar, Peter Grehan
* All rights reserved.
diff --git a/lib/libc/powerpc/static_tls.h b/lib/libc/powerpc/static_tls.h
index fd7a80d49234..dce086861b19 100644
--- a/lib/libc/powerpc/static_tls.h
+++ b/lib/libc/powerpc/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/powerpc/sys/__vdso_gettc.c b/lib/libc/powerpc/sys/__vdso_gettc.c
index e54e5c3f54d4..1d26baa32461 100644
--- a/lib/libc/powerpc/sys/__vdso_gettc.c
+++ b/lib/libc/powerpc/sys/__vdso_gettc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Brandon Bergren <bdragon@FreeBSD.org>
*
diff --git a/lib/libc/powerpc64/_fpmath.h b/lib/libc/powerpc64/_fpmath.h
index 76eaa1eff089..be99da8f05d8 100644
--- a/lib/libc/powerpc64/_fpmath.h
+++ b/lib/libc/powerpc64/_fpmath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/powerpc64/gen/_get_tp.c b/lib/libc/powerpc64/gen/_get_tp.c
index 16f5c952276e..e4c53e4456c4 100644
--- a/lib/libc/powerpc64/gen/_get_tp.c
+++ b/lib/libc/powerpc64/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/powerpc64/gen/_set_tp.c b/lib/libc/powerpc64/gen/_set_tp.c
index 541ad2d0d8a4..5a5ee061153b 100644
--- a/lib/libc/powerpc64/gen/_set_tp.c
+++ b/lib/libc/powerpc64/gen/_set_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/powerpc64/gen/fpsetround.c b/lib/libc/powerpc64/gen/fpsetround.c
index 2faee6d5bdfd..9a1956113c85 100644
--- a/lib/libc/powerpc64/gen/fpsetround.c
+++ b/lib/libc/powerpc64/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-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/lib/libc/powerpc64/gen/makecontext.c b/lib/libc/powerpc64/gen/makecontext.c
index 7663b6f82e7d..3d47c981e97f 100644
--- a/lib/libc/powerpc64/gen/makecontext.c
+++ b/lib/libc/powerpc64/gen/makecontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Suleiman Souhlal
* All rights reserved.
diff --git a/lib/libc/powerpc64/gen/signalcontext.c b/lib/libc/powerpc64/gen/signalcontext.c
index 6157f0657f07..3821a7cf1b42 100644
--- a/lib/libc/powerpc64/gen/signalcontext.c
+++ b/lib/libc/powerpc64/gen/signalcontext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar, Peter Grehan
* All rights reserved.
diff --git a/lib/libc/powerpc64/static_tls.h b/lib/libc/powerpc64/static_tls.h
index 63adba39bab1..80f2202b87c8 100644
--- a/lib/libc/powerpc64/static_tls.h
+++ b/lib/libc/powerpc64/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/powerpc64/sys/__vdso_gettc.c b/lib/libc/powerpc64/sys/__vdso_gettc.c
index 0ccf91d5d214..57cdf3722399 100644
--- a/lib/libc/powerpc64/sys/__vdso_gettc.c
+++ b/lib/libc/powerpc64/sys/__vdso_gettc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Brandon Bergren <bdragon@FreeBSD.org>
*
diff --git a/lib/libc/resolv/h_errno.c b/lib/libc/resolv/h_errno.c
index 06ea60390d40..dcf92e6bf880 100644
--- a/lib/libc/resolv/h_errno.c
+++ b/lib/libc/resolv/h_errno.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 The FreeBSD Project. All rights reserved.
*
diff --git a/lib/libc/resolv/res_state.c b/lib/libc/resolv/res_state.c
index 976d09c2cbaf..2c4e5e290a3b 100644
--- a/lib/libc/resolv/res_state.c
+++ b/lib/libc/resolv/res_state.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 The FreeBSD Project. All rights reserved.
*
diff --git a/lib/libc/riscv/gen/_get_tp.c b/lib/libc/riscv/gen/_get_tp.c
index 0477e3ab8ca9..a13667dad6ec 100644
--- a/lib/libc/riscv/gen/_get_tp.c
+++ b/lib/libc/riscv/gen/_get_tp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/lib/libc/riscv/static_tls.h b/lib/libc/riscv/static_tls.h
index dcdc459b8c19..8e44f817446c 100644
--- a/lib/libc/riscv/static_tls.h
+++ b/lib/libc/riscv/static_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libc/rpc/mt_misc.h b/lib/libc/rpc/mt_misc.h
index 7f3ced02c148..da93505a8cc7 100644
--- a/lib/libc/rpc/mt_misc.h
+++ b/lib/libc/rpc/mt_misc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006 The FreeBSD Project. All rights reserved.
*
diff --git a/lib/libc/rpc/rpcsec_gss_stub.c b/lib/libc/rpc/rpcsec_gss_stub.c
index a24f250521f7..efb4011e873d 100644
--- a/lib/libc/rpc/rpcsec_gss_stub.c
+++ b/lib/libc/rpc/rpcsec_gss_stub.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Doug Rabson
* All rights reserved.
diff --git a/lib/libc/stdio/dprintf.c b/lib/libc/stdio/dprintf.c
index c6f4fbd87e1f..4467a1f1f020 100644
--- a/lib/libc/stdio/dprintf.c
+++ b/lib/libc/stdio/dprintf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/fcloseall.c b/lib/libc/stdio/fcloseall.c
index 6248c6123d02..bd3e8c38ea41 100644
--- a/lib/libc/stdio/fcloseall.c
+++ b/lib/libc/stdio/fcloseall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006 Daniel M. Eischen. All rights reserved.
*
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
index edad907fe806..6b1d5b18e387 100644
--- a/lib/libc/stdio/fgetwc.c
+++ b/lib/libc/stdio/fgetwc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
index b9077d68fc21..e04a7a708de8 100644
--- a/lib/libc/stdio/fgetwln.c
+++ b/lib/libc/stdio/fgetwln.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
index 84fc387ecae4..de54b0afdb2d 100644
--- a/lib/libc/stdio/fgetws.c
+++ b/lib/libc/stdio/fgetws.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/fmemopen.c b/lib/libc/stdio/fmemopen.c
index 8faf2fa146db..63a0b4246ef4 100644
--- a/lib/libc/stdio/fmemopen.c
+++ b/lib/libc/stdio/fmemopen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013 Pietro Cerutti <gahr@FreeBSD.org>
*
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
index 666dd8bcc9d1..e0c8f8e97189 100644
--- a/lib/libc/stdio/fputwc.c
+++ b/lib/libc/stdio/fputwc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index 56357b650979..d1607fda56e3 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
index b7a8b3909196..a785e2effbc1 100644
--- a/lib/libc/stdio/fwide.c
+++ b/lib/libc/stdio/fwide.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
index fb00c2e4b20d..4dd230112c8e 100644
--- a/lib/libc/stdio/fwprintf.c
+++ b/lib/libc/stdio/fwprintf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
index df31be7b5bf1..3f14b83f5ecb 100644
--- a/lib/libc/stdio/fwscanf.c
+++ b/lib/libc/stdio/fwscanf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/getdelim.c b/lib/libc/stdio/getdelim.c
index 8d8414266c78..0963ffe3d9d7 100644
--- a/lib/libc/stdio/getdelim.c
+++ b/lib/libc/stdio/getdelim.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/getline.c b/lib/libc/stdio/getline.c
index f101f7f1c3ef..c8fa63f45188 100644
--- a/lib/libc/stdio/getline.c
+++ b/lib/libc/stdio/getline.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
index d27988ba3163..bdb46d6c304b 100644
--- a/lib/libc/stdio/getwc.c
+++ b/lib/libc/stdio/getwc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
index 2828075520a6..ecf7aa75b996 100644
--- a/lib/libc/stdio/getwchar.c
+++ b/lib/libc/stdio/getwchar.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/open_memstream.c b/lib/libc/stdio/open_memstream.c
index 12b7164af98f..256ec785ca3d 100644
--- a/lib/libc/stdio/open_memstream.c
+++ b/lib/libc/stdio/open_memstream.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/lib/libc/stdio/open_wmemstream.c b/lib/libc/stdio/open_wmemstream.c
index 1ea7c82e4aa7..8e385be22719 100644
--- a/lib/libc/stdio/open_wmemstream.c
+++ b/lib/libc/stdio/open_wmemstream.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
index 510a3af70eda..8931cf0c042c 100644
--- a/lib/libc/stdio/putwc.c
+++ b/lib/libc/stdio/putwc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
index a042e449e03a..df7d5c4f51b1 100644
--- a/lib/libc/stdio/putwchar.c
+++ b/lib/libc/stdio/putwchar.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
index 39bb7346099c..f8c204c2a8fc 100644
--- a/lib/libc/stdio/swprintf.c
+++ b/lib/libc/stdio/swprintf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
index e45449c16d53..702f9a9c46b8 100644
--- a/lib/libc/stdio/swscanf.c
+++ b/lib/libc/stdio/swscanf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
index d7705c8199a2..3676c59ab04f 100644
--- a/lib/libc/stdio/ungetwc.c
+++ b/lib/libc/stdio/ungetwc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2004 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/stdio/vdprintf.c b/lib/libc/stdio/vdprintf.c
index 73f87b0f0cfa..fd6a64ae216a 100644
--- a/lib/libc/stdio/vdprintf.c
+++ b/lib/libc/stdio/vdprintf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
index f0aca08ac65a..3d6788e0704d 100644
--- a/lib/libc/stdio/vwprintf.c
+++ b/lib/libc/stdio/vwprintf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
index 6f80c249d2d5..4f6e31446316 100644
--- a/lib/libc/stdio/vwscanf.c
+++ b/lib/libc/stdio/vwscanf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
index c1d1f2656b7a..5552e2314ecf 100644
--- a/lib/libc/stdio/wprintf.c
+++ b/lib/libc/stdio/wprintf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
index 33e0f3805d1c..d425bc238b7e 100644
--- a/lib/libc/stdio/wscanf.c
+++ b/lib/libc/stdio/wscanf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c
index 7312ac6e0694..0239c7586d5f 100644
--- a/lib/libc/stdio/xprintf_errno.c
+++ b/lib/libc/stdio/xprintf_errno.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libc/stdio/xprintf_hexdump.c b/lib/libc/stdio/xprintf_hexdump.c
index 0b7dfb3ff221..f6106c4624fc 100644
--- a/lib/libc/stdio/xprintf_hexdump.c
+++ b/lib/libc/stdio/xprintf_hexdump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libc/stdio/xprintf_quote.c b/lib/libc/stdio/xprintf_quote.c
index 5b102b10c632..4c1ded763ad7 100644
--- a/lib/libc/stdio/xprintf_quote.c
+++ b/lib/libc/stdio/xprintf_quote.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libc/stdio/xprintf_vis.c b/lib/libc/stdio/xprintf_vis.c
index ab1735b8543d..bf33a97083f9 100644
--- a/lib/libc/stdio/xprintf_vis.c
+++ b/lib/libc/stdio/xprintf_vis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index a413e8d7d93f..00eb860e17e4 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sean C. Farley <scf@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index d2b7c1cd8cac..c9a08472f3e1 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Nuxi, https://nuxi.nl/
*
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
index 7af863502ee5..aab3897cdbbf 100644
--- a/lib/libc/stdlib/imaxabs.c
+++ b/lib/libc/stdlib/imaxabs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
index 4d9f77546b9a..97814a281586 100644
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
index 6b405f0314d1..b78478030179 100644
--- a/lib/libc/stdlib/llabs.c
+++ b/lib/libc/stdlib/llabs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
index 47c13ee30e11..27a471c6ca7a 100644
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/ptsname.c b/lib/libc/stdlib/ptsname.c
index 6851d3d76555..449329d74cf4 100644
--- a/lib/libc/stdlib/ptsname.c
+++ b/lib/libc/stdlib/ptsname.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/quick_exit.c b/lib/libc/stdlib/quick_exit.c
index 676dc287a511..d486b1a83493 100644
--- a/lib/libc/stdlib/quick_exit.c
+++ b/lib/libc/stdlib/quick_exit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Chisnall
* All rights reserved.
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 9cebfd0c9519..888878053f36 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index 0e3cd53fff2f..505cec637620 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/stdlib/strtold.c b/lib/libc/stdlib/strtold.c
index 250b8558acb9..ab7f9a4049cf 100644
--- a/lib/libc/stdlib/strtold.c
+++ b/lib/libc/stdlib/strtold.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index 091e037b6365..b975137c60bb 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Gary Mills
* Copyright 2011, Nexenta Systems, Inc. All rights reserved.
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index f9d33eb8d927..3a401dc4d0ee 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
* Copyright (c) 1997 FreeBSD Inc.
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
index f65fb179fc3f..9cba4b3427b4 100644
--- a/lib/libc/stdtime/timelocal.h
+++ b/lib/libc/stdtime/timelocal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2002 FreeBSD Project.
* All rights reserved.
diff --git a/lib/libc/string/mempcpy.c b/lib/libc/string/mempcpy.c
index 12c0d791e9d3..2838df7d2743 100644
--- a/lib/libc/string/mempcpy.c
+++ b/lib/libc/string/mempcpy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/string/stpncpy.c b/lib/libc/string/stpncpy.c
index d8267cc812c7..3e7f1b69f08a 100644
--- a/lib/libc/string/stpncpy.c
+++ b/lib/libc/string/stpncpy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index 7aa2c2a642c4..ee1c88531f20 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 6e07c8c920d2..33ccdfdd557f 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index a862ffc245ca..000b5c5e5361 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2010 Xin LI <delphij@FreeBSD.org>
*
diff --git a/lib/libc/string/strnlen.c b/lib/libc/string/strnlen.c
index fca7ad260ef8..ef0cd86e5278 100644
--- a/lib/libc/string/strnlen.c
+++ b/lib/libc/string/strnlen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index f2e9f2706ba7..93ddbcf0ca75 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index 3252173430f2..a5b25273fa31 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
diff --git a/lib/libc/string/wcpncpy.c b/lib/libc/string/wcpncpy.c
index 58b7d39aa3cf..ccc64cd49d61 100644
--- a/lib/libc/string/wcpncpy.c
+++ b/lib/libc/string/wcpncpy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/string/wcscasecmp.c b/lib/libc/string/wcscasecmp.c
index 1f75ef93cdd1..03a61f8656b6 100644
--- a/lib/libc/string/wcscasecmp.c
+++ b/lib/libc/string/wcscasecmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index 7428ba3364f2..777a576bb557 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c)1999 Citrus Project,
* All rights reserved.
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 1375ed9181cf..a7f1de04fe28 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c
index d8ef9320f8df..974166b8967a 100644
--- a/lib/libc/string/wcscoll.c
+++ b/lib/libc/string/wcscoll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2017 Nexenta Systems, Inc.
* Copyright (c) 2002 Tim J. Robbins
diff --git a/lib/libc/string/wcsdup.c b/lib/libc/string/wcsdup.c
index eecc0557d284..327574bad763 100644
--- a/lib/libc/string/wcsdup.c
+++ b/lib/libc/string/wcsdup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Tim J. Robbins.
* All rights reserved.
diff --git a/lib/libc/string/wcsncasecmp.c b/lib/libc/string/wcsncasecmp.c
index 34833d185fdf..39f58be0bff8 100644
--- a/lib/libc/string/wcsncasecmp.c
+++ b/lib/libc/string/wcsncasecmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/string/wcsnlen.c b/lib/libc/string/wcsnlen.c
index f7e30d766c02..15fd520101a1 100644
--- a/lib/libc/string/wcsnlen.c
+++ b/lib/libc/string/wcsnlen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index 73a0395fdc41..cc5e7f2ff6e1 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c
index c9603d1881fe..ff40a8fc45f5 100644
--- a/lib/libc/string/wcsxfrm.c
+++ b/lib/libc/string/wcsxfrm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
diff --git a/lib/libc/string/wmempcpy.c b/lib/libc/string/wmempcpy.c
index 208d62a26849..1cf2382f1ead 100644
--- a/lib/libc/string/wmempcpy.c
+++ b/lib/libc/string/wmempcpy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libc/sys/__vdso_gettimeofday.c b/lib/libc/sys/__vdso_gettimeofday.c
index cf1400cdf291..0bf9f0782d19 100644
--- a/lib/libc/sys/__vdso_gettimeofday.c
+++ b/lib/libc/sys/__vdso_gettimeofday.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
*
diff --git a/lib/libc/sys/brk.c b/lib/libc/sys/brk.c
index 7e50737d3e18..66e04656a8f7 100644
--- a/lib/libc/sys/brk.c
+++ b/lib/libc/sys/brk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Mark Johnston <markj@FreeBSD.org>
*
diff --git a/lib/libc/sys/clock_gettime.c b/lib/libc/sys/clock_gettime.c
index cf95986973e2..ec8ec13a754d 100644
--- a/lib/libc/sys/clock_gettime.c
+++ b/lib/libc/sys/clock_gettime.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
*
diff --git a/lib/libc/sys/closefrom.c b/lib/libc/sys/closefrom.c
index 8ff2f9e96e4a..56982bba5b8a 100644
--- a/lib/libc/sys/closefrom.c
+++ b/lib/libc/sys/closefrom.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/lib/libc/sys/fcntl.c b/lib/libc/sys/fcntl.c
index f61cf426cc30..974835b8f163 100644
--- a/lib/libc/sys/fcntl.c
+++ b/lib/libc/sys/fcntl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c
index f24cd41269db..22177b15a5c7 100644
--- a/lib/libc/sys/gettimeofday.c
+++ b/lib/libc/sys/gettimeofday.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
*
diff --git a/lib/libc/sys/shm_open.c b/lib/libc/sys/shm_open.c
index e5666a3558e9..16dfb051b77f 100644
--- a/lib/libc/sys/shm_open.c
+++ b/lib/libc/sys/shm_open.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/lib/libc/sys/sigwait.c b/lib/libc/sys/sigwait.c
index ad485d0c5241..76bd9f1ae40a 100644
--- a/lib/libc/sys/sigwait.c
+++ b/lib/libc/sys/sigwait.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 davidxu@freebsd.org
*
diff --git a/lib/libc/tests/gen/getentropy_test.c b/lib/libc/tests/gen/getentropy_test.c
index 1290e6e50529..90954cc092aa 100644
--- a/lib/libc/tests/gen/getentropy_test.c
+++ b/lib/libc/tests/gen/getentropy_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/tests/gen/makecontext_test.c b/lib/libc/tests/gen/makecontext_test.c
index 50d835d15cbe..16bf4bbe10eb 100644
--- a/lib/libc/tests/gen/makecontext_test.c
+++ b/lib/libc/tests/gen/makecontext_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 John H. Baldwin <jhb@FreeBSD.org>
*
diff --git a/lib/libc/tests/gen/sigsetops_test.c b/lib/libc/tests/gen/sigsetops_test.c
index ba9abed403b0..e4aa53e9b1c0 100644
--- a/lib/libc/tests/gen/sigsetops_test.c
+++ b/lib/libc/tests/gen/sigsetops_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc/tests/sys/brk_test.c b/lib/libc/tests/sys/brk_test.c
index 57b3d605e775..6b8796b89b04 100644
--- a/lib/libc/tests/sys/brk_test.c
+++ b/lib/libc/tests/sys/brk_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Mark Johnston <markj@FreeBSD.org>
*
diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c
index 655fd2b7f3ba..ca299376d499 100644
--- a/lib/libc/uuid/uuid_compare.c
+++ b/lib/libc/uuid/uuid_compare.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
index 5ff4732f9792..6913345e673c 100644
--- a/lib/libc/uuid/uuid_create.c
+++ b/lib/libc/uuid/uuid_create.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
index 0fd68712c7b5..1b258d738a45 100644
--- a/lib/libc/uuid/uuid_create_nil.c
+++ b/lib/libc/uuid/uuid_create_nil.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c
index 885cb109c383..2ce344771451 100644
--- a/lib/libc/uuid/uuid_equal.c
+++ b/lib/libc/uuid/uuid_equal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
index 3eeefe5038e9..514b91963acd 100644
--- a/lib/libc/uuid/uuid_from_string.c
+++ b/lib/libc/uuid/uuid_from_string.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c
index 513f27e753f6..5b80b9be56fd 100644
--- a/lib/libc/uuid/uuid_hash.c
+++ b/lib/libc/uuid/uuid_hash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
index 893b2a305f44..97e6d28e558b 100644
--- a/lib/libc/uuid/uuid_is_nil.c
+++ b/lib/libc/uuid/uuid_is_nil.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/uuid/uuid_stream.c b/lib/libc/uuid/uuid_stream.c
index 89e7050dc2fe..e8a8e5afc67f 100644
--- a/lib/libc/uuid/uuid_stream.c
+++ b/lib/libc/uuid/uuid_stream.c
@@ -1,7 +1,7 @@
/* $NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
index 7d362c7564e8..167b36230778 100644
--- a/lib/libc/uuid/uuid_to_string.c
+++ b/lib/libc/uuid/uuid_to_string.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002,2005 Marcel Moolenaar
* Copyright (c) 2002 Hiten Mahesh Pandya
diff --git a/lib/libc/x86/gen/getcontextx.c b/lib/libc/x86/gen/getcontextx.c
index 056128a149ff..e0190ca982d9 100644
--- a/lib/libc/x86/gen/getcontextx.c
+++ b/lib/libc/x86/gen/getcontextx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libc_nonshared/__stub.c b/lib/libc_nonshared/__stub.c
index b4a75488f8f5..f9c5a688c459 100644
--- a/lib/libc_nonshared/__stub.c
+++ b/lib/libc_nonshared/__stub.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index 4c89a5d9cf01..ec8ab0405269 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
diff --git a/lib/libcalendar/calendar.h b/lib/libcalendar/calendar.h
index 1dadd9c64fe7..bc6cf7267fc1 100644
--- a/lib/libcalendar/calendar.h
+++ b/lib/libcalendar/calendar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index 9ab0f8a7064d..b6533c61de05 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index 6ebdb30ab82b..63c347663c42 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999, 2002 Kenneth D. Merry.
* All rights reserved.
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index 1cb65785442a..3ae775cd87f5 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-4-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-4-Clause)
*
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
diff --git a/lib/libcasper/libcasper/libcasper.c b/lib/libcasper/libcasper/libcasper.c
index 509590e7ae71..884c2ffe51f7 100644
--- a/lib/libcasper/libcasper/libcasper.c
+++ b/lib/libcasper/libcasper/libcasper.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/libcasper.h b/lib/libcasper/libcasper/libcasper.h
index b55619b01506..e6221bd35e19 100644
--- a/lib/libcasper/libcasper/libcasper.h
+++ b/lib/libcasper/libcasper/libcasper.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 The FreeBSD Foundation
* Copyright (c) 2015-2017 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/libcasper_impl.c b/lib/libcasper/libcasper/libcasper_impl.c
index ae28c8769a07..407e82628173 100644
--- a/lib/libcasper/libcasper/libcasper_impl.c
+++ b/lib/libcasper/libcasper/libcasper_impl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/libcasper_impl.h b/lib/libcasper/libcasper/libcasper_impl.h
index 24049a0c07c8..cb88ab2edafc 100644
--- a/lib/libcasper/libcasper/libcasper_impl.h
+++ b/lib/libcasper/libcasper/libcasper_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/libcasper_service.c b/lib/libcasper/libcasper/libcasper_service.c
index 387f9b036517..c52c86c79e5b 100644
--- a/lib/libcasper/libcasper/libcasper_service.c
+++ b/lib/libcasper/libcasper/libcasper_service.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/libcasper_service.h b/lib/libcasper/libcasper/libcasper_service.h
index c0ebfa4571a5..097d89d5f1f8 100644
--- a/lib/libcasper/libcasper/libcasper_service.h
+++ b/lib/libcasper/libcasper/libcasper_service.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c
index e87d0640347c..a29732667ad7 100644
--- a/lib/libcasper/libcasper/service.c
+++ b/lib/libcasper/libcasper/service.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/zygote.c b/lib/libcasper/libcasper/zygote.c
index 5cdd139cc134..d51b276cd50e 100644
--- a/lib/libcasper/libcasper/zygote.c
+++ b/lib/libcasper/libcasper/zygote.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/libcasper/zygote.h b/lib/libcasper/libcasper/zygote.h
index 2006da8f4073..4cefde2da236 100644
--- a/lib/libcasper/libcasper/zygote.h
+++ b/lib/libcasper/libcasper/zygote.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libcasper/services/cap_dns/cap_dns.c b/lib/libcasper/services/cap_dns/cap_dns.c
index 85e5f41f052b..46fcf7a69e70 100644
--- a/lib/libcasper/services/cap_dns/cap_dns.c
+++ b/lib/libcasper/services/cap_dns/cap_dns.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_dns/tests/dns_test.c b/lib/libcasper/services/cap_dns/tests/dns_test.c
index 06856574fce9..d9660fdb345e 100644
--- a/lib/libcasper/services/cap_dns/tests/dns_test.c
+++ b/lib/libcasper/services/cap_dns/tests/dns_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.c b/lib/libcasper/services/cap_fileargs/cap_fileargs.c
index 2e501a860ee6..e975db1b2a1a 100644
--- a/lib/libcasper/services/cap_fileargs/cap_fileargs.c
+++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018-2021 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.h b/lib/libcasper/services/cap_fileargs/cap_fileargs.h
index 6e8523cb9423..0072d2d042a2 100644
--- a/lib/libcasper/services/cap_fileargs/cap_fileargs.h
+++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libcasper/services/cap_grp/cap_grp.c b/lib/libcasper/services/cap_grp/cap_grp.c
index 7134b0cd8432..491abbfed6b4 100644
--- a/lib/libcasper/services/cap_grp/cap_grp.c
+++ b/lib/libcasper/services/cap_grp/cap_grp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_grp/tests/grp_test.c b/lib/libcasper/services/cap_grp/tests/grp_test.c
index 1e84e293e214..dffd5b9d859c 100644
--- a/lib/libcasper/services/cap_grp/tests/grp_test.c
+++ b/lib/libcasper/services/cap_grp/tests/grp_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c
index c6abaa69faf6..67b39bb2dd21 100644
--- a/lib/libcasper/services/cap_net/cap_net.c
+++ b/lib/libcasper/services/cap_net/cap_net.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Mariusz Zaborski <oshogbo@FreeBSD.org>
*
diff --git a/lib/libcasper/services/cap_net/cap_net.h b/lib/libcasper/services/cap_net/cap_net.h
index 59943c700724..a8f15318abae 100644
--- a/lib/libcasper/services/cap_net/cap_net.h
+++ b/lib/libcasper/services/cap_net/cap_net.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Mariusz Zaborski <oshogbo@FreeBSD.org>
*
diff --git a/lib/libcasper/services/cap_pwd/cap_pwd.c b/lib/libcasper/services/cap_pwd/cap_pwd.c
index bbda55768520..0bad653d4f91 100644
--- a/lib/libcasper/services/cap_pwd/cap_pwd.c
+++ b/lib/libcasper/services/cap_pwd/cap_pwd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_pwd/tests/pwd_test.c b/lib/libcasper/services/cap_pwd/tests/pwd_test.c
index 17978bd94eee..3c7c8bb057a8 100644
--- a/lib/libcasper/services/cap_pwd/tests/pwd_test.c
+++ b/lib/libcasper/services/cap_pwd/tests/pwd_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.c b/lib/libcasper/services/cap_sysctl/cap_sysctl.c
index 3f9631d7faca..f743016a15bb 100644
--- a/lib/libcasper/services/cap_sysctl/cap_sysctl.c
+++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, 2018 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
index cbe5c3c57724..6a32679fc999 100644
--- a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
+++ b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, 2018 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libcasper/services/cap_syslog/cap_syslog.c b/lib/libcasper/services/cap_syslog/cap_syslog.c
index 6f8f7c0de8a2..2895cfcdd2f5 100644
--- a/lib/libcasper/services/cap_syslog/cap_syslog.c
+++ b/lib/libcasper/services/cap_syslog/cap_syslog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Mariusz Zaborski <oshogbo@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c
index 708826763445..c691ff35fcb1 100644
--- a/lib/libcrypt/crypt-md5.c
+++ b/lib/libcrypt/crypt-md5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c
index bb2d60b27846..b66aa72e10bc 100644
--- a/lib/libcrypt/crypt-nthash.c
+++ b/lib/libcrypt/crypt-nthash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Michael Bretterklieber
* All rights reserved.
diff --git a/lib/libcrypt/crypt-sha256.c b/lib/libcrypt/crypt-sha256.c
index 56a6fab58ae4..df0785abaef0 100644
--- a/lib/libcrypt/crypt-sha256.c
+++ b/lib/libcrypt/crypt-sha256.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Project. All rights reserved.
*
diff --git a/lib/libcrypt/crypt-sha512.c b/lib/libcrypt/crypt-sha512.c
index 8b23c6b224e7..034c41cc148b 100644
--- a/lib/libcrypt/crypt-sha512.c
+++ b/lib/libcrypt/crypt-sha512.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Project. All rights reserved.
*
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index 13411321338f..0f912d146f96 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Mark Murray
* Copyright (c) 2014 Dag-Erling Smørgrav
diff --git a/lib/libcrypt/crypt.h b/lib/libcrypt/crypt.h
index 891b43d4e17c..2fc3af125941 100644
--- a/lib/libcrypt/crypt.h
+++ b/lib/libcrypt/crypt.h
@@ -1,6 +1,6 @@
/* LINTLIBRARY */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999
* Mark Murray. All rights reserved.
diff --git a/lib/libdevinfo/devinfo.c b/lib/libdevinfo/devinfo.c
index 581d3464cd0e..daef8ad0d7bf 100644
--- a/lib/libdevinfo/devinfo.c
+++ b/lib/libdevinfo/devinfo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h
index e096e1dc1982..9727b47a2d88 100644
--- a/lib/libdevinfo/devinfo.h
+++ b/lib/libdevinfo/devinfo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/lib/libdevinfo/devinfo_var.h b/lib/libdevinfo/devinfo_var.h
index c282642e812b..b560d5c74440 100644
--- a/lib/libdevinfo/devinfo_var.h
+++ b/lib/libdevinfo/devinfo_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/lib/libgeom/geom_util.c b/lib/libgeom/geom_util.c
index 83d2bf51225f..6ad7ca6ea911 100644
--- a/lib/libgeom/geom_util.c
+++ b/lib/libgeom/geom_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libgssapi/context.h b/lib/libgssapi/context.h
index dcb08df2a3a8..92099282bf60 100644
--- a/lib/libgssapi/context.h
+++ b/lib/libgssapi/context.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/cred.h b/lib/libgssapi/cred.h
index 3e6e9f25339b..6d915bc52ce4 100644
--- a/lib/libgssapi/cred.h
+++ b/lib/libgssapi/cred.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_accept_sec_context.c b/lib/libgssapi/gss_accept_sec_context.c
index 74da9791d678..d52d913491f4 100644
--- a/lib/libgssapi/gss_accept_sec_context.c
+++ b/lib/libgssapi/gss_accept_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_acquire_cred.c b/lib/libgssapi/gss_acquire_cred.c
index 5c04a97c28ee..20243cc82717 100644
--- a/lib/libgssapi/gss_acquire_cred.c
+++ b/lib/libgssapi/gss_acquire_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_add_cred.c b/lib/libgssapi/gss_add_cred.c
index a8955b200d00..6fd04279fe83 100644
--- a/lib/libgssapi/gss_add_cred.c
+++ b/lib/libgssapi/gss_add_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_add_oid_set_member.c b/lib/libgssapi/gss_add_oid_set_member.c
index 2c926c483926..925bd1829532 100644
--- a/lib/libgssapi/gss_add_oid_set_member.c
+++ b/lib/libgssapi/gss_add_oid_set_member.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_canonicalize_name.c b/lib/libgssapi/gss_canonicalize_name.c
index 1967555a4e60..fe142a10d18d 100644
--- a/lib/libgssapi/gss_canonicalize_name.c
+++ b/lib/libgssapi/gss_canonicalize_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_compare_name.c b/lib/libgssapi/gss_compare_name.c
index c30a67687c20..29a699949e82 100644
--- a/lib/libgssapi/gss_compare_name.c
+++ b/lib/libgssapi/gss_compare_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_context_time.c b/lib/libgssapi/gss_context_time.c
index 86f04696733c..fc0b8123dcd9 100644
--- a/lib/libgssapi/gss_context_time.c
+++ b/lib/libgssapi/gss_context_time.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_create_empty_oid_set.c b/lib/libgssapi/gss_create_empty_oid_set.c
index e7d1f77c91d2..e1ce51e9608a 100644
--- a/lib/libgssapi/gss_create_empty_oid_set.c
+++ b/lib/libgssapi/gss_create_empty_oid_set.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_decapsulate_token.c b/lib/libgssapi/gss_decapsulate_token.c
index d48a854f9267..87cccd703c8e 100644
--- a/lib/libgssapi/gss_decapsulate_token.c
+++ b/lib/libgssapi/gss_decapsulate_token.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_delete_sec_context.c
index 151147010c12..930f51399cce 100644
--- a/lib/libgssapi/gss_delete_sec_context.c
+++ b/lib/libgssapi/gss_delete_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_display_name.c b/lib/libgssapi/gss_display_name.c
index 907ab0f22504..c937f9c2ed8e 100644
--- a/lib/libgssapi/gss_display_name.c
+++ b/lib/libgssapi/gss_display_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_duplicate_name.c b/lib/libgssapi/gss_duplicate_name.c
index 579d77e3bd97..7345f982cb99 100644
--- a/lib/libgssapi/gss_duplicate_name.c
+++ b/lib/libgssapi/gss_duplicate_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_duplicate_oid.c b/lib/libgssapi/gss_duplicate_oid.c
index c61dedd6cb77..3774dcc96d0b 100644
--- a/lib/libgssapi/gss_duplicate_oid.c
+++ b/lib/libgssapi/gss_duplicate_oid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_encapsulate_token.c b/lib/libgssapi/gss_encapsulate_token.c
index e7ab7f84ff7a..5a42f212d627 100644
--- a/lib/libgssapi/gss_encapsulate_token.c
+++ b/lib/libgssapi/gss_encapsulate_token.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_export_name.c b/lib/libgssapi/gss_export_name.c
index 5b7c32955539..e2678ae2c3c6 100644
--- a/lib/libgssapi/gss_export_name.c
+++ b/lib/libgssapi/gss_export_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_export_sec_context.c b/lib/libgssapi/gss_export_sec_context.c
index d5963231dbfb..4f08818b1a61 100644
--- a/lib/libgssapi/gss_export_sec_context.c
+++ b/lib/libgssapi/gss_export_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_get_mic.c b/lib/libgssapi/gss_get_mic.c
index e8b4e52a0df3..34a372769cc4 100644
--- a/lib/libgssapi/gss_get_mic.c
+++ b/lib/libgssapi/gss_get_mic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_import_name.c b/lib/libgssapi/gss_import_name.c
index efc02d5f3028..1e3a344009bc 100644
--- a/lib/libgssapi/gss_import_name.c
+++ b/lib/libgssapi/gss_import_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_import_sec_context.c b/lib/libgssapi/gss_import_sec_context.c
index ad11a0b4dac5..3c2dda8644df 100644
--- a/lib/libgssapi/gss_import_sec_context.c
+++ b/lib/libgssapi/gss_import_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_indicate_mechs.c b/lib/libgssapi/gss_indicate_mechs.c
index ac5b77ee3bfd..f6f165d774b6 100644
--- a/lib/libgssapi/gss_indicate_mechs.c
+++ b/lib/libgssapi/gss_indicate_mechs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_init_sec_context.c b/lib/libgssapi/gss_init_sec_context.c
index 04a1e3eab3d2..cf2bb1256c11 100644
--- a/lib/libgssapi/gss_init_sec_context.c
+++ b/lib/libgssapi/gss_init_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_inquire_context.c b/lib/libgssapi/gss_inquire_context.c
index 207e1c357e9c..3c9ee1af3ac1 100644
--- a/lib/libgssapi/gss_inquire_context.c
+++ b/lib/libgssapi/gss_inquire_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_inquire_cred.c b/lib/libgssapi/gss_inquire_cred.c
index 60984371558a..8c6753dfc549 100644
--- a/lib/libgssapi/gss_inquire_cred.c
+++ b/lib/libgssapi/gss_inquire_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_inquire_cred_by_mech.c b/lib/libgssapi/gss_inquire_cred_by_mech.c
index b8394fa3e94d..537393547e01 100644
--- a/lib/libgssapi/gss_inquire_cred_by_mech.c
+++ b/lib/libgssapi/gss_inquire_cred_by_mech.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_inquire_mechs_for_name.c b/lib/libgssapi/gss_inquire_mechs_for_name.c
index 1ff1c30cf249..e552f48d7998 100644
--- a/lib/libgssapi/gss_inquire_mechs_for_name.c
+++ b/lib/libgssapi/gss_inquire_mechs_for_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_inquire_names_for_mech.c b/lib/libgssapi/gss_inquire_names_for_mech.c
index 4d683075290c..a7362c6dfc01 100644
--- a/lib/libgssapi/gss_inquire_names_for_mech.c
+++ b/lib/libgssapi/gss_inquire_names_for_mech.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_inquire_sec_context_by_oid.c b/lib/libgssapi/gss_inquire_sec_context_by_oid.c
index b4a4670b60be..6c38e9f21292 100644
--- a/lib/libgssapi/gss_inquire_sec_context_by_oid.c
+++ b/lib/libgssapi/gss_inquire_sec_context_by_oid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_krb5.c b/lib/libgssapi/gss_krb5.c
index 36b6f3556632..aa82eb7498d3 100644
--- a/lib/libgssapi/gss_krb5.c
+++ b/lib/libgssapi/gss_krb5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_mech_switch.c b/lib/libgssapi/gss_mech_switch.c
index 56a23b372759..df4b7a9b8ea5 100644
--- a/lib/libgssapi/gss_mech_switch.c
+++ b/lib/libgssapi/gss_mech_switch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_names.c b/lib/libgssapi/gss_names.c
index 075556451dc5..b8f6991c5ec6 100644
--- a/lib/libgssapi/gss_names.c
+++ b/lib/libgssapi/gss_names.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_pname_to_uid.c b/lib/libgssapi/gss_pname_to_uid.c
index ec2a3bd91e54..bd450c1e9a12 100644
--- a/lib/libgssapi/gss_pname_to_uid.c
+++ b/lib/libgssapi/gss_pname_to_uid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/lib/libgssapi/gss_process_context_token.c b/lib/libgssapi/gss_process_context_token.c
index 2a91ece95d26..7bc8be3288c7 100644
--- a/lib/libgssapi/gss_process_context_token.c
+++ b/lib/libgssapi/gss_process_context_token.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_release_buffer.c b/lib/libgssapi/gss_release_buffer.c
index 8a32d8db4530..889b7f9fba58 100644
--- a/lib/libgssapi/gss_release_buffer.c
+++ b/lib/libgssapi/gss_release_buffer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_release_cred.c b/lib/libgssapi/gss_release_cred.c
index abcb6d18a7a9..e4dc03d47311 100644
--- a/lib/libgssapi/gss_release_cred.c
+++ b/lib/libgssapi/gss_release_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_release_name.c b/lib/libgssapi/gss_release_name.c
index 56fcf26b4a51..d9b662ec3bb1 100644
--- a/lib/libgssapi/gss_release_name.c
+++ b/lib/libgssapi/gss_release_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_release_oid_set.c b/lib/libgssapi/gss_release_oid_set.c
index 6a5a1577f85f..fa600309bd05 100644
--- a/lib/libgssapi/gss_release_oid_set.c
+++ b/lib/libgssapi/gss_release_oid_set.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_seal.c b/lib/libgssapi/gss_seal.c
index 9d0e25c52220..421c41f59c43 100644
--- a/lib/libgssapi/gss_seal.c
+++ b/lib/libgssapi/gss_seal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_sign.c b/lib/libgssapi/gss_sign.c
index e8ebf3784c77..b9eb17c82bb2 100644
--- a/lib/libgssapi/gss_sign.c
+++ b/lib/libgssapi/gss_sign.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_test_oid_set_member.c b/lib/libgssapi/gss_test_oid_set_member.c
index dde6c7a66ad1..6833eb7333c7 100644
--- a/lib/libgssapi/gss_test_oid_set_member.c
+++ b/lib/libgssapi/gss_test_oid_set_member.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_unseal.c b/lib/libgssapi/gss_unseal.c
index 6da0ac92c5f2..9bc6b70a7937 100644
--- a/lib/libgssapi/gss_unseal.c
+++ b/lib/libgssapi/gss_unseal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_unwrap.c b/lib/libgssapi/gss_unwrap.c
index 7faf2a691d4b..0be5a0d7c31b 100644
--- a/lib/libgssapi/gss_unwrap.c
+++ b/lib/libgssapi/gss_unwrap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_utils.c b/lib/libgssapi/gss_utils.c
index ca55cc8df968..297d592cb00e 100644
--- a/lib/libgssapi/gss_utils.c
+++ b/lib/libgssapi/gss_utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_verify.c b/lib/libgssapi/gss_verify.c
index 5892d3e48259..8c883fccf197 100644
--- a/lib/libgssapi/gss_verify.c
+++ b/lib/libgssapi/gss_verify.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_verify_mic.c b/lib/libgssapi/gss_verify_mic.c
index 689bf724650f..8da3e669a44a 100644
--- a/lib/libgssapi/gss_verify_mic.c
+++ b/lib/libgssapi/gss_verify_mic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_wrap.c b/lib/libgssapi/gss_wrap.c
index dfb6bc877d31..74d2c43bc3f6 100644
--- a/lib/libgssapi/gss_wrap.c
+++ b/lib/libgssapi/gss_wrap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/gss_wrap_size_limit.c b/lib/libgssapi/gss_wrap_size_limit.c
index 30d422c52fe9..703501bca973 100644
--- a/lib/libgssapi/gss_wrap_size_limit.c
+++ b/lib/libgssapi/gss_wrap_size_limit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/mech_switch.h b/lib/libgssapi/mech_switch.h
index 4018f9e22a7c..121db088d9e0 100644
--- a/lib/libgssapi/mech_switch.h
+++ b/lib/libgssapi/mech_switch.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/name.h b/lib/libgssapi/name.h
index 803d915a521e..c483acb9ca4f 100644
--- a/lib/libgssapi/name.h
+++ b/lib/libgssapi/name.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/spnego.h b/lib/libgssapi/spnego.h
index 2fa3a6024ad2..6f529ddd07ab 100644
--- a/lib/libgssapi/spnego.h
+++ b/lib/libgssapi/spnego.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libgssapi/utils.h b/lib/libgssapi/utils.h
index fb0bd72f7eae..c11276ba3c4a 100644
--- a/lib/libgssapi/utils.h
+++ b/lib/libgssapi/utils.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/lib/libiscsiutil/chap.c b/lib/libiscsiutil/chap.c
index b33fef220106..90fce9683487 100644
--- a/lib/libiscsiutil/chap.c
+++ b/lib/libiscsiutil/chap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/connection.c b/lib/libiscsiutil/connection.c
index 7dc50574644c..0fbf0c95e30e 100644
--- a/lib/libiscsiutil/connection.c
+++ b/lib/libiscsiutil/connection.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/keys.c b/lib/libiscsiutil/keys.c
index f1f087239b7e..e0529d1ff19d 100644
--- a/lib/libiscsiutil/keys.c
+++ b/lib/libiscsiutil/keys.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/libiscsiutil.h b/lib/libiscsiutil/libiscsiutil.h
index 97d699c6c4b9..e24a34127bd8 100644
--- a/lib/libiscsiutil/libiscsiutil.h
+++ b/lib/libiscsiutil/libiscsiutil.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/log.c b/lib/libiscsiutil/log.c
index 7d7a13bb11f2..a69c979c3cce 100644
--- a/lib/libiscsiutil/log.c
+++ b/lib/libiscsiutil/log.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/pdu.c b/lib/libiscsiutil/pdu.c
index ed5ee5b71766..4787ead2198c 100644
--- a/lib/libiscsiutil/pdu.c
+++ b/lib/libiscsiutil/pdu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/text.c b/lib/libiscsiutil/text.c
index f8b88e4f70be..a4f587845005 100644
--- a/lib/libiscsiutil/text.c
+++ b/lib/libiscsiutil/text.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libiscsiutil/utils.c b/lib/libiscsiutil/utils.c
index 1e04490c477c..e078c7a53a17 100644
--- a/lib/libiscsiutil/utils.c
+++ b/lib/libiscsiutil/utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c
index 3e0c2a0f98cb..5c81d6a2087d 100644
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 James Gritton.
* All rights reserved.
diff --git a/lib/libjail/jail.h b/lib/libjail/jail.h
index c38e84916607..ff09376f351d 100644
--- a/lib/libjail/jail.h
+++ b/lib/libjail/jail.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 James Gritton.
* All rights reserved.
diff --git a/lib/libjail/jail_getid.c b/lib/libjail/jail_getid.c
index 3700ff0d36cc..d4281af42940 100644
--- a/lib/libjail/jail_getid.c
+++ b/lib/libjail/jail_getid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 James Gritton.
* All rights reserved.
diff --git a/lib/libkiconv/kiconv_sysctl.c b/lib/libkiconv/kiconv_sysctl.c
index 841a162bfd27..d530954b8185 100644
--- a/lib/libkiconv/kiconv_sysctl.c
+++ b/lib/libkiconv/kiconv_sysctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ryuichiro Imura
* All rights reserved.
diff --git a/lib/libkiconv/quirks.c b/lib/libkiconv/quirks.c
index e2bb1e66beb1..fbae7e1b88b5 100644
--- a/lib/libkiconv/quirks.c
+++ b/lib/libkiconv/quirks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
diff --git a/lib/libkiconv/quirks.h b/lib/libkiconv/quirks.h
index 80a6558bceb2..04054a2d07a9 100644
--- a/lib/libkiconv/quirks.h
+++ b/lib/libkiconv/quirks.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c
index 4d23f8d2a7e1..e08eff0c7f35 100644
--- a/lib/libkiconv/xlat16_iconv.c
+++ b/lib/libkiconv/xlat16_iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2005 Ryuichiro Imura
* All rights reserved.
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index 7fd58f977614..686084bd31f4 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, Matthew Dillon. All Rights Reserved.
* Copyright (c) 2001, Thomas Moestl. All Rights Reserved.
diff --git a/lib/libkvm/kvm_minidump_amd64.c b/lib/libkvm/kvm_minidump_amd64.c
index d69925e47446..4bb4a9e24725 100644
--- a/lib/libkvm/kvm_minidump_amd64.c
+++ b/lib/libkvm/kvm_minidump_amd64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
*
diff --git a/lib/libkvm/kvm_minidump_arm.c b/lib/libkvm/kvm_minidump_arm.c
index 82b83c10c799..a7dc5ea23203 100644
--- a/lib/libkvm/kvm_minidump_arm.c
+++ b/lib/libkvm/kvm_minidump_arm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
* Copyright (c) 2006 Peter Wemm
diff --git a/lib/libkvm/kvm_minidump_i386.c b/lib/libkvm/kvm_minidump_i386.c
index 4f077ca1739a..21821f8a528a 100644
--- a/lib/libkvm/kvm_minidump_i386.c
+++ b/lib/libkvm/kvm_minidump_i386.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
*
diff --git a/lib/libkvm/kvm_minidump_mips.c b/lib/libkvm/kvm_minidump_mips.c
index dda6f3551872..a4ede5b01511 100644
--- a/lib/libkvm/kvm_minidump_mips.c
+++ b/lib/libkvm/kvm_minidump_mips.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Oleksandr Tymoshenko
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
diff --git a/lib/libkvm/kvm_powerpc64.h b/lib/libkvm/kvm_powerpc64.h
index 21734152bdd3..79279bb4e6db 100644
--- a/lib/libkvm/kvm_powerpc64.h
+++ b/lib/libkvm/kvm_powerpc64.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Leandro Lupori
*
diff --git a/lib/libkvm/kvm_vnet.c b/lib/libkvm/kvm_vnet.c
index 79493bc5ffa8..68a60808e9f0 100644
--- a/lib/libkvm/kvm_vnet.c
+++ b/lib/libkvm/kvm_vnet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Robert N. M. Watson
* Copyright (c) 2009 Bjoern A. Zeeb <bz@FreeBSD.org>
diff --git a/lib/libmemstat/memstat.c b/lib/libmemstat/memstat.c
index b3788661ae95..e1ed53adfc5d 100644
--- a/lib/libmemstat/memstat.c
+++ b/lib/libmemstat/memstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libmemstat/memstat.h b/lib/libmemstat/memstat.h
index f57b7fbc96a4..48cf8615af7f 100644
--- a/lib/libmemstat/memstat.h
+++ b/lib/libmemstat/memstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libmemstat/memstat_all.c b/lib/libmemstat/memstat_all.c
index b0eb50f81ccb..b1e25c896f51 100644
--- a/lib/libmemstat/memstat_all.c
+++ b/lib/libmemstat/memstat_all.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libmemstat/memstat_internal.h b/lib/libmemstat/memstat_internal.h
index 26a9e64f8f05..d0829e197544 100644
--- a/lib/libmemstat/memstat_internal.h
+++ b/lib/libmemstat/memstat_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libmemstat/memstat_malloc.c b/lib/libmemstat/memstat_malloc.c
index 6b8fe49ca333..97d895420cc7 100644
--- a/lib/libmemstat/memstat_malloc.c
+++ b/lib/libmemstat/memstat_malloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index 980a674ab76e..14daf41ebf90 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Robert N. M. Watson
* All rights reserved.
diff --git a/lib/libmp/mpasbn.c b/lib/libmp/mpasbn.c
index 31e366cea551..f6501d725cb2 100644
--- a/lib/libmp/mpasbn.c
+++ b/lib/libmp/mpasbn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
diff --git a/lib/libnetbsd/rmd160.h b/lib/libnetbsd/rmd160.h
index 105c1efdd92a..0eefac837f57 100644
--- a/lib/libnetbsd/rmd160.h
+++ b/lib/libnetbsd/rmd160.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 SRI International
* All rights reserved.
diff --git a/lib/libnetbsd/sha1.h b/lib/libnetbsd/sha1.h
index d75365fe108a..3dc7ce5536a5 100644
--- a/lib/libnetbsd/sha1.h
+++ b/lib/libnetbsd/sha1.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 SRI International
* All rights reserved.
diff --git a/lib/libnetbsd/sha2.h b/lib/libnetbsd/sha2.h
index 44c6c9945a88..84d79310e882 100644
--- a/lib/libnetbsd/sha2.h
+++ b/lib/libnetbsd/sha2.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 SRI International
* All rights reserved.
diff --git a/lib/libnetbsd/util.c b/lib/libnetbsd/util.c
index 30f306a4f15e..c737acd9cbc7 100644
--- a/lib/libnetbsd/util.c
+++ b/lib/libnetbsd/util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 SRI International
* All rights reserved.
diff --git a/lib/libnetmap/libnetmap.h b/lib/libnetmap/libnetmap.h
index 0367a1735c4f..02a13f59c205 100644
--- a/lib/libnetmap/libnetmap.h
+++ b/lib/libnetmap/libnetmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Universita` di Pisa
* All rights reserved.
diff --git a/lib/libnetmap/nmctx-pthreads.c b/lib/libnetmap/nmctx-pthreads.c
index 34b8bb4e1315..84bab2e5d2d5 100644
--- a/lib/libnetmap/nmctx-pthreads.c
+++ b/lib/libnetmap/nmctx-pthreads.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Universita` di Pisa
* All rights reserved.
diff --git a/lib/libnetmap/nmctx.c b/lib/libnetmap/nmctx.c
index 5f2c8c32febd..bbd6e49bd2f4 100644
--- a/lib/libnetmap/nmctx.c
+++ b/lib/libnetmap/nmctx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Universita` di Pisa
* All rights reserved.
diff --git a/lib/libnetmap/nmport.c b/lib/libnetmap/nmport.c
index a3fd7e87100f..d1b847d770a7 100644
--- a/lib/libnetmap/nmport.c
+++ b/lib/libnetmap/nmport.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Universita` di Pisa
* All rights reserved.
diff --git a/lib/libnetmap/nmreq.c b/lib/libnetmap/nmreq.c
index 31ddea91f6a5..ed72ea0bf62f 100644
--- a/lib/libnetmap/nmreq.c
+++ b/lib/libnetmap/nmreq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Universita` di Pisa
* All rights reserved.
diff --git a/lib/libnv/common_impl.h b/lib/libnv/common_impl.h
index 69154466203a..f06c30dca056 100644
--- a/lib/libnv/common_impl.h
+++ b/lib/libnv/common_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c
index 7cec4c898f04..fc4418bfc8e0 100644
--- a/lib/libnv/msgio.c
+++ b/lib/libnv/msgio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/lib/libnv/msgio.h b/lib/libnv/msgio.h
index 13592e4cd0fb..c8d87222cc19 100644
--- a/lib/libnv/msgio.h
+++ b/lib/libnv/msgio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libpam/libpam/security/pam_mod_misc.h b/lib/libpam/libpam/security/pam_mod_misc.h
index 08c9c1ab8f56..62deaf1709b0 100644
--- a/lib/libpam/libpam/security/pam_mod_misc.h
+++ b/lib/libpam/libpam/security/pam_mod_misc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c
index 1a4ebc39f65a..ddf25438a437 100644
--- a/lib/libpam/modules/pam_ksu/pam_ksu.c
+++ b/lib/libpam/modules/pam_ksu/pam_ksu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Jacques A. Vidrine <nectar@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libpam/modules/pam_permit/pam_permit.c b/lib/libpam/modules/pam_permit/pam_permit.c
index 38f44b222609..a9b9bc14eba4 100644
--- a/lib/libpam/modules/pam_permit/pam_permit.c
+++ b/lib/libpam/modules/pam_permit/pam_permit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2001 Mark R V Murray
* All rights reserved.
diff --git a/lib/libpjdlog/pjdlog.c b/lib/libpjdlog/pjdlog.c
index eb7ddb2b7a88..64deabceda03 100644
--- a/lib/libpjdlog/pjdlog.c
+++ b/lib/libpjdlog/pjdlog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/lib/libpjdlog/pjdlog.h b/lib/libpjdlog/pjdlog.h
index 9db5b15d1ba6..9418a043ec12 100644
--- a/lib/libpjdlog/pjdlog.h
+++ b/lib/libpjdlog/pjdlog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c
index b4418a30f328..dae3b4fb2d67 100644
--- a/lib/libpmc/libpmc.c
+++ b/lib/libpmc/libpmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Joseph Koshy
* All rights reserved.
diff --git a/lib/libpmc/libpmc_json.cc b/lib/libpmc/libpmc_json.cc
index 0a4a8d68a540..2e9857ca98a8 100644
--- a/lib/libpmc/libpmc_json.cc
+++ b/lib/libpmc/libpmc_json.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c
index 6bfc1547af63..13f9f5a9955a 100644
--- a/lib/libpmc/libpmc_pmu_util.c
+++ b/lib/libpmc/libpmc_pmu_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
* Copyright (c) 2021, The FreeBSD Foundation
diff --git a/lib/libpmc/libpmcinternal.h b/lib/libpmc/libpmcinternal.h
index 0e7c6631b00d..e6e7e85578df 100644
--- a/lib/libpmc/libpmcinternal.h
+++ b/lib/libpmc/libpmcinternal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
diff --git a/lib/libpmc/pmc.h b/lib/libpmc/pmc.h
index 7579f93a42b1..a504bb5a8caf 100644
--- a/lib/libpmc/pmc.h
+++ b/lib/libpmc/pmc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003,2004 Joseph Koshy
* All rights reserved.
diff --git a/lib/libpmc/pmcformat.h b/lib/libpmc/pmcformat.h
index 813873e854eb..075568526864 100644
--- a/lib/libpmc/pmcformat.h
+++ b/lib/libpmc/pmcformat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c
index 9569cd9da2b5..babcdc3c8d0d 100644
--- a/lib/libpmc/pmclog.c
+++ b/lib/libpmc/pmclog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/lib/libpmc/pmclog.h b/lib/libpmc/pmclog.h
index 1aea2cc0d071..c81246b168eb 100644
--- a/lib/libpmc/pmclog.h
+++ b/lib/libpmc/pmclog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/lib/libproc/_libproc.h b/lib/libproc/_libproc.h
index d212b4d1a541..0b0d8628b9b4 100644
--- a/lib/libproc/_libproc.h
+++ b/lib/libproc/_libproc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 John Birrell (jb@freebsd.org)
* All rights reserved.
diff --git a/lib/libproc/libproc.h b/lib/libproc/libproc.h
index ef88f94c4752..e9a2f3935d84 100644
--- a/lib/libproc/libproc.h
+++ b/lib/libproc/libproc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2008 John Birrell (jb@freebsd.org)
diff --git a/lib/libproc/proc_bkpt.c b/lib/libproc/proc_bkpt.c
index ff37bb7c4461..cb5e1ece58b6 100644
--- a/lib/libproc/proc_bkpt.c
+++ b/lib/libproc/proc_bkpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libproc/proc_create.c b/lib/libproc/proc_create.c
index 4c24988f630e..3645f2825bd5 100644
--- a/lib/libproc/proc_create.c
+++ b/lib/libproc/proc_create.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 John Birrell (jb@freebsd.org)
* All rights reserved.
diff --git a/lib/libproc/proc_regs.c b/lib/libproc/proc_regs.c
index da2cba18bbbd..578e1fa9131e 100644
--- a/lib/libproc/proc_regs.c
+++ b/lib/libproc/proc_regs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libproc/proc_rtld.c b/lib/libproc/proc_rtld.c
index 4b1b274e5c71..6fccb4b3430a 100644
--- a/lib/libproc/proc_rtld.c
+++ b/lib/libproc/proc_rtld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c
index 27b0fc15a2ab..f62848acd986 100644
--- a/lib/libproc/proc_sym.c
+++ b/lib/libproc/proc_sym.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2017 Mark Johnston <markj@FreeBSD.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c
index ceef76bc8106..36d0de76e8fe 100644
--- a/lib/libproc/proc_util.c
+++ b/lib/libproc/proc_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2008 John Birrell (jb@freebsd.org)
diff --git a/lib/libprocstat/common_kvm.h b/lib/libprocstat/common_kvm.h
index a8a74b5464b3..3e84c6487080 100644
--- a/lib/libprocstat/common_kvm.h
+++ b/lib/libprocstat/common_kvm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libprocstat/core.c b/lib/libprocstat/core.c
index c3d5f8bec495..95c633c6f323 100644
--- a/lib/libprocstat/core.c
+++ b/lib/libprocstat/core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Mikolaj Golub <trociny@FreeBSD.org>
* Copyright (c) 2017 Dell EMC
diff --git a/lib/libprocstat/core.h b/lib/libprocstat/core.h
index 1b3da375baf4..b02f22a92aba 100644
--- a/lib/libprocstat/core.h
+++ b/lib/libprocstat/core.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Mikolaj Golub <trociny@FreeBSD.org>
* Copyright (c) 2017 Dell EMC
diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h
index 2432adb1aec3..3e64f2a30207 100644
--- a/lib/libprocstat/libprocstat.h
+++ b/lib/libprocstat/libprocstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* Copyright (c) 2017 Dell EMC
diff --git a/lib/libprocstat/libprocstat_internal.h b/lib/libprocstat/libprocstat_internal.h
index 38045379c794..6376bd2953e4 100644
--- a/lib/libprocstat/libprocstat_internal.h
+++ b/lib/libprocstat/libprocstat_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c
index 86da07d62acd..59d6f135aa2f 100644
--- a/lib/libprocstat/smbfs.c
+++ b/lib/libprocstat/smbfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c
index 6cf765ce0f5f..15d1050d0100 100644
--- a/lib/libprocstat/udf.c
+++ b/lib/libprocstat/udf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c
index 066b0053a245..d26bceba5a7e 100644
--- a/lib/libprocstat/zfs.c
+++ b/lib/libprocstat/zfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Ulf Lilleengen
* All rights reserved.
diff --git a/lib/libprocstat/zfs_defs.c b/lib/libprocstat/zfs_defs.c
index c41054f05136..098fdfe981a9 100644
--- a/lib/libprocstat/zfs_defs.c
+++ b/lib/libprocstat/zfs_defs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
*
diff --git a/lib/libprocstat/zfs_defs.h b/lib/libprocstat/zfs_defs.h
index 40c2e4d6e7e4..bf9754b6d409 100644
--- a/lib/libprocstat/zfs_defs.h
+++ b/lib/libprocstat/zfs_defs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
*
diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c
index dd65eda285cb..56c66aa81bdb 100644
--- a/lib/libradius/radlib.c
+++ b/lib/libradius/radlib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libradius/radlib.h b/lib/libradius/radlib.h
index 0d17f3c61466..860bba0743b0 100644
--- a/lib/libradius/radlib.h
+++ b/lib/libradius/radlib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libradius/radlib_private.h b/lib/libradius/radlib_private.h
index 858ce98c8346..9d368687e238 100644
--- a/lib/libradius/radlib_private.h
+++ b/lib/libradius/radlib_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libradius/radlib_vs.h b/lib/libradius/radlib_vs.h
index 6b2d4c6486ed..328c054f6a9e 100644
--- a/lib/libradius/radlib_vs.h
+++ b/lib/libradius/radlib_vs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/lib/libregex/tests/libregex_test.sh b/lib/libregex/tests/libregex_test.sh
index 5e4e49c3ad38..43cef227ea40 100755
--- a/lib/libregex/tests/libregex_test.sh
+++ b/lib/libregex/tests/libregex_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/lib/librpcsec_gss/rpcsec_gss_conf.c b/lib/librpcsec_gss/rpcsec_gss_conf.c
index 74bdfc58a659..ff24cb434218 100644
--- a/lib/librpcsec_gss/rpcsec_gss_conf.c
+++ b/lib/librpcsec_gss/rpcsec_gss_conf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/librpcsec_gss/rpcsec_gss_misc.c b/lib/librpcsec_gss/rpcsec_gss_misc.c
index fe44b41764d7..34737ce9e4c5 100644
--- a/lib/librpcsec_gss/rpcsec_gss_misc.c
+++ b/lib/librpcsec_gss/rpcsec_gss_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/lib/librt/aio.c b/lib/librt/aio.c
index 9c35644ecf3d..383b2ae0f7e6 100644
--- a/lib/librt/aio.c
+++ b/lib/librt/aio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/librt/mq.c b/lib/librt/mq.c
index 127e64e18f34..4ab4371bb8d9 100644
--- a/lib/librt/mq.c
+++ b/lib/librt/mq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/librt/sigev_thread.c b/lib/librt/sigev_thread.c
index 9ddac9d6633a..6dd01af758f8 100644
--- a/lib/librt/sigev_thread.c
+++ b/lib/librt/sigev_thread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/librt/sigev_thread.h b/lib/librt/sigev_thread.h
index cf968ebb9cf3..a866a38683c6 100644
--- a/lib/librt/sigev_thread.h
+++ b/lib/librt/sigev_thread.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/librt/timer.c b/lib/librt/timer.c
index f7b5e4fd7e72..05a0e3b3906e 100644
--- a/lib/librt/timer.c
+++ b/lib/librt/timer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/librtld_db/rtld_db.c b/lib/librtld_db/rtld_db.c
index 18e16f36e62c..ac392801d7c7 100644
--- a/lib/librtld_db/rtld_db.c
+++ b/lib/librtld_db/rtld_db.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/librtld_db/rtld_db.h b/lib/librtld_db/rtld_db.h
index 8ff3dd5d31ea..030718dd1bdd 100644
--- a/lib/librtld_db/rtld_db.h
+++ b/lib/librtld_db/rtld_db.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libsdp/sdp-int.h b/lib/libsdp/sdp-int.h
index 4d4dd2bcddd9..acf0469d3a70 100644
--- a/lib/libsdp/sdp-int.h
+++ b/lib/libsdp/sdp-int.h
@@ -1,7 +1,7 @@
/*-
* sdp-int.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h
index f120fc50f774..87c18a308224 100644
--- a/lib/libsdp/sdp.h
+++ b/lib/libsdp/sdp.h
@@ -1,7 +1,7 @@
/*-
* sdp.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 9fab2963a5fe..1ccf55339522 100644
--- a/lib/libsdp/search.c
+++ b/lib/libsdp/search.c
@@ -1,7 +1,7 @@
/*-
* search.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c
index 3309adefeb1f..2240f0da82c6 100644
--- a/lib/libsdp/service.c
+++ b/lib/libsdp/service.c
@@ -1,7 +1,7 @@
/*-
* service.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libsdp/session.c b/lib/libsdp/session.c
index 43be17c0294e..0f8e954c7386 100644
--- a/lib/libsdp/session.c
+++ b/lib/libsdp/session.c
@@ -1,7 +1,7 @@
/*-
* session.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c
index 8e3cfea2ea76..c45aac784115 100644
--- a/lib/libsdp/util.c
+++ b/lib/libsdp/util.c
@@ -1,7 +1,7 @@
/*-
* util.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/lib/libstdbuf/stdbuf.c b/lib/libstdbuf/stdbuf.c
index e303605865f7..9a5cada28f50 100644
--- a/lib/libstdbuf/stdbuf.c
+++ b/lib/libstdbuf/stdbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libstdthreads/call_once.c b/lib/libstdthreads/call_once.c
index bb8618ce2818..f00e30800083 100644
--- a/lib/libstdthreads/call_once.c
+++ b/lib/libstdthreads/call_once.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libstdthreads/cnd.c b/lib/libstdthreads/cnd.c
index a27d55d729a8..0c3cbdd70958 100644
--- a/lib/libstdthreads/cnd.c
+++ b/lib/libstdthreads/cnd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libstdthreads/mtx.c b/lib/libstdthreads/mtx.c
index f009d19edf23..124ddd65e3e4 100644
--- a/lib/libstdthreads/mtx.c
+++ b/lib/libstdthreads/mtx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libstdthreads/thrd.c b/lib/libstdthreads/thrd.c
index 82fcdce693c8..5ecfb91cb965 100644
--- a/lib/libstdthreads/thrd.c
+++ b/lib/libstdthreads/thrd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libstdthreads/threads.h b/lib/libstdthreads/threads.h
index b274f7f8a68e..fdf56bb15710 100644
--- a/lib/libstdthreads/threads.h
+++ b/lib/libstdthreads/threads.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libstdthreads/tss.c b/lib/libstdthreads/tss.c
index 846ea7d4e268..a7e085bc0569 100644
--- a/lib/libstdthreads/tss.c
+++ b/lib/libstdthreads/tss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libsysdecode/tests/sysdecode_test.c b/lib/libsysdecode/tests/sysdecode_test.c
index c41fdae68927..fa14debc443c 100644
--- a/lib/libsysdecode/tests/sysdecode_test.c
+++ b/lib/libsysdecode/tests/sysdecode_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 The FreeBSD Foundation
*
diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c
index 8a7e78bc37e4..54bdb95c68ab 100644
--- a/lib/libtacplus/taclib.c
+++ b/lib/libtacplus/taclib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001, 2002, Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libtacplus/taclib.h b/lib/libtacplus/taclib.h
index 7973a608c2ab..cb08d94c0e74 100644
--- a/lib/libtacplus/taclib.h
+++ b/lib/libtacplus/taclib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001, Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libtacplus/taclib_private.h b/lib/libtacplus/taclib_private.h
index f48a89ebf40f..66208c257e7a 100644
--- a/lib/libtacplus/taclib_private.h
+++ b/lib/libtacplus/taclib_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001, Juniper Networks, Inc.
* All rights reserved.
diff --git a/lib/libthr/arch/aarch64/include/pthread_tls.h b/lib/libthr/arch/aarch64/include/pthread_tls.h
index bd3a4fbb2024..f6afca5f0886 100644
--- a/lib/libthr/arch/aarch64/include/pthread_tls.h
+++ b/lib/libthr/arch/aarch64/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/arch/amd64/include/pthread_md.h b/lib/libthr/arch/amd64/include/pthread_md.h
index acfbd551b3de..77396aca138e 100644
--- a/lib/libthr/arch/amd64/include/pthread_md.h
+++ b/lib/libthr/arch/amd64/include/pthread_md.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2003 David Xu <davidxu@freebsd.org>
* Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
diff --git a/lib/libthr/arch/amd64/include/pthread_tls.h b/lib/libthr/arch/amd64/include/pthread_tls.h
index c0ca6201d41c..f7575992538b 100644
--- a/lib/libthr/arch/amd64/include/pthread_tls.h
+++ b/lib/libthr/arch/amd64/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h
index dfd7e7d951bf..0efc34f5dcab 100644
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/lib/libthr/arch/arm/include/pthread_tls.h b/lib/libthr/arch/arm/include/pthread_tls.h
index 6aef9c22f365..dc78e8a246cc 100644
--- a/lib/libthr/arch/arm/include/pthread_tls.h
+++ b/lib/libthr/arch/arm/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/arch/i386/include/pthread_md.h b/lib/libthr/arch/i386/include/pthread_md.h
index 8940acee6fee..0c354e18d033 100644
--- a/lib/libthr/arch/i386/include/pthread_md.h
+++ b/lib/libthr/arch/i386/include/pthread_md.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Daniel Eischen <deischen@freebsd.org>.
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
diff --git a/lib/libthr/arch/i386/include/pthread_tls.h b/lib/libthr/arch/i386/include/pthread_tls.h
index f48147fd6455..f93491f93afc 100644
--- a/lib/libthr/arch/i386/include/pthread_tls.h
+++ b/lib/libthr/arch/i386/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h
index a25d1b011de8..1d9fdd8a43cb 100644
--- a/lib/libthr/arch/mips/include/pthread_md.h
+++ b/lib/libthr/arch/mips/include/pthread_md.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/lib/libthr/arch/mips/include/pthread_tls.h b/lib/libthr/arch/mips/include/pthread_tls.h
index ed69d6d2a170..c018dfbe98a2 100644
--- a/lib/libthr/arch/mips/include/pthread_tls.h
+++ b/lib/libthr/arch/mips/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/arch/powerpc/include/pthread_tls.h b/lib/libthr/arch/powerpc/include/pthread_tls.h
index 5c8db311f8d8..3f1816807ea8 100644
--- a/lib/libthr/arch/powerpc/include/pthread_tls.h
+++ b/lib/libthr/arch/powerpc/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S b/lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S
index a902a7360d7b..9971232ec7bf 100644
--- a/lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S
+++ b/lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Brandon Bergren <bdragon@FreeBSD.org>
*
diff --git a/lib/libthr/arch/riscv/include/pthread_tls.h b/lib/libthr/arch/riscv/include/pthread_tls.h
index eb3e47b70260..5d1e11eb91cc 100644
--- a/lib/libthr/arch/riscv/include/pthread_tls.h
+++ b/lib/libthr/arch/riscv/include/pthread_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/lib/libthr/thread/thr_affinity.c b/lib/libthr/thread/thr_affinity.c
index 1a820b72b9f3..796e5d77f4ec 100644
--- a/lib/libthr/thread/thr_affinity.c
+++ b/lib/libthr/thread/thr_affinity.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c
index fc42588cb412..8c0271040345 100644
--- a/lib/libthr/thread/thr_barrier.c
+++ b/lib/libthr/thread/thr_barrier.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c
index 09d8c9cff606..7036f0ff63d3 100644
--- a/lib/libthr/thread/thr_barrierattr.c
+++ b/lib/libthr/thread/thr_barrierattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c
index 7e78fe9163c7..69388526508c 100644
--- a/lib/libthr/thread/thr_cancel.c
+++ b/lib/libthr/thread/thr_cancel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c
index 925792a92662..8ba2c572fe54 100644
--- a/lib/libthr/thread/thr_cond.c
+++ b/lib/libthr/thread/thr_cond.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 2015 The FreeBSD Foundation
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index b99e5825f5f5..8d4d72e950d4 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Daniel M. Eischen <deischen@gdeb.com>
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c
index 2618f637b5df..d08715738a59 100644
--- a/lib/libthr/thread/thr_detach.c
+++ b/lib/libthr/thread/thr_detach.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org>
diff --git a/lib/libthr/thread/thr_event.c b/lib/libthr/thread/thr_event.c
index 977c0dacb7c7..714de15b0720 100644
--- a/lib/libthr/thread/thr_event.c
+++ b/lib/libthr/thread/thr_event.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu
* All rights reserved.
diff --git a/lib/libthr/thread/thr_getcpuclockid.c b/lib/libthr/thread/thr_getcpuclockid.c
index 20f63039ea89..4bedcc379010 100644
--- a/lib/libthr/thread/thr_getcpuclockid.c
+++ b/lib/libthr/thread/thr_getcpuclockid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_getthreadid_np.c b/lib/libthr/thread/thr_getthreadid_np.c
index 9f522b79cb06..5891b8b2e23d 100644
--- a/lib/libthr/thread/thr_getthreadid_np.c
+++ b/lib/libthr/thread/thr_getthreadid_np.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Jung-uk Kim <jkim@FreeBSD.org>
*
diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c
index ab3ed68eccaa..453d48243586 100644
--- a/lib/libthr/thread/thr_join.c
+++ b/lib/libthr/thread/thr_join.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_kern.c b/lib/libthr/thread/thr_kern.c
index 0b83b2dd5ac9..bdc749d38968 100644
--- a/lib/libthr/thread/thr_kern.c
+++ b/lib/libthr/thread/thr_kern.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org>
diff --git a/lib/libthr/thread/thr_list.c b/lib/libthr/thread/thr_list.c
index f28f059c2909..6ecdeda0af8a 100644
--- a/lib/libthr/thread/thr_list.c
+++ b/lib/libthr/thread/thr_list.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (C) 2003 Daniel M. Eischen <deischen@freebsd.org>
diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c
index ff28d1d8a5ac..35871d805ef4 100644
--- a/lib/libthr/thread/thr_main_np.c
+++ b/lib/libthr/thread/thr_main_np.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alfred Perlstein
* Author: Alfred Perlstein <alfred@FreeBSD.org>
diff --git a/lib/libthr/thread/thr_malloc.c b/lib/libthr/thread/thr_malloc.c
index b4a627cc55eb..216791ee4fce 100644
--- a/lib/libthr/thread/thr_malloc.c
+++ b/lib/libthr/thread/thr_malloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
* All rights reserved.
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index 6783d8f644f8..e34c2f34b5e2 100644
--- a/lib/libthr/thread/thr_once.c
+++ b/lib/libthr/thread/thr_once.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c
index dd761783a2a6..817030f946de 100644
--- a/lib/libthr/thread/thr_printf.c
+++ b/lib/libthr/thread/thr_printf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Jonathan Mini <mini@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 910de374accf..e235ff424358 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 Daniel M. Eischen <deischen@freebsd.org>
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c
index b1b8164c9777..374fe498034b 100644
--- a/lib/libthr/thread/thr_pspinlock.c
+++ b/lib/libthr/thread/thr_pspinlock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David Xu <davidxu@freebsd.org>
* Copyright (c) 2016 The FreeBSD Foundation
diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c
index fe4fb7ae0602..cedc13a1440e 100644
--- a/lib/libthr/thread/thr_rtld.c
+++ b/lib/libthr/thread/thr_rtld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index a61eb35cbd31..af32b09963d9 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Alex Nash
* All rights reserved.
diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c
index b0b8e70a44c4..8c8e20b8ddd9 100644
--- a/lib/libthr/thread/thr_rwlockattr.c
+++ b/lib/libthr/thread/thr_rwlockattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Alex Nash
* All rights reserved.
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index 66386764666a..73817761b02c 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/thread/thr_sem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 David Xu <davidxu@freebsd.org>.
* Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index 20f62dad99c9..b47e520b2edf 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_sleepq.c b/lib/libthr/thread/thr_sleepq.c
index 05145a739681..ca374ab2ed65 100644
--- a/lib/libthr/thread/thr_sleepq.c
+++ b/lib/libthr/thread/thr_sleepq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index 3befb740639e..73a176081853 100644
--- a/lib/libthr/thread/thr_stack.c
+++ b/lib/libthr/thread/thr_stack.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
* Copyright (c) 2000-2001 Jason Evans <jasone@freebsd.org>
diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c
index 86e5a1f13780..5143ffb78496 100644
--- a/lib/libthr/thread/thr_umtx.c
+++ b/lib/libthr/thread/thr_umtx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthr/thread/thr_umtx.h b/lib/libthr/thread/thr_umtx.h
index 1017214adb5c..66b9b61cda65 100644
--- a/lib/libthr/thread/thr_umtx.h
+++ b/lib/libthr/thread/thr_umtx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 83ec8c1b0367..7aff9c070830 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
diff --git a/lib/libthread_db/arch/arm/libpthread_md.c b/lib/libthread_db/arch/arm/libpthread_md.c
index 34ebbf4c5046..a3e4b24f7280 100644
--- a/lib/libthread_db/arch/arm/libpthread_md.c
+++ b/lib/libthread_db/arch/arm/libpthread_md.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Olivier Houchard
* All rights reserved.
diff --git a/lib/libthread_db/arch/i386/libpthread_md.c b/lib/libthread_db/arch/i386/libpthread_md.c
index e657bf984a6f..f01b844d355b 100644
--- a/lib/libthread_db/arch/i386/libpthread_md.c
+++ b/lib/libthread_db/arch/i386/libpthread_md.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthread_db/arch/powerpc/libpthread_md.c b/lib/libthread_db/arch/powerpc/libpthread_md.c
index a1302edcc278..b9aa25b561b5 100644
--- a/lib/libthread_db/arch/powerpc/libpthread_md.c
+++ b/lib/libthread_db/arch/powerpc/libpthread_md.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/lib/libthread_db/kse.h b/lib/libthread_db/kse.h
index e85aa0f493d3..0a80e7309904 100644
--- a/lib/libthread_db/kse.h
+++ b/lib/libthread_db/kse.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Julian Elischer <julian@freebsd.org>
* for the FreeBSD Foundation.
diff --git a/lib/libthread_db/libpthread_db.c b/lib/libthread_db/libpthread_db.c
index 5e2453c760f6..b7b2ca70cb3b 100644
--- a/lib/libthread_db/libpthread_db.c
+++ b/lib/libthread_db/libpthread_db.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthread_db/libpthread_db.h b/lib/libthread_db/libpthread_db.h
index ec14298313d6..9e20d12c42f9 100644
--- a/lib/libthread_db/libpthread_db.h
+++ b/lib/libthread_db/libpthread_db.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthread_db/libthr_db.c b/lib/libthread_db/libthr_db.c
index 343467b5eb7b..5e105c6040cc 100644
--- a/lib/libthread_db/libthr_db.c
+++ b/lib/libthread_db/libthr_db.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* Copyright (c) 2005 David Xu
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index 0bf4276dc19c..99c283e77479 100644
--- a/lib/libthread_db/thread_db.c
+++ b/lib/libthread_db/thread_db.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libthread_db/thread_db.h b/lib/libthread_db/thread_db.h
index 35f5c0683b8c..31f6dffd326c 100644
--- a/lib/libthread_db/thread_db.h
+++ b/lib/libthread_db/thread_db.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
diff --git a/lib/libthread_db/thread_db_int.h b/lib/libthread_db/thread_db_int.h
index fe520d911222..65b16ba53654 100644
--- a/lib/libthread_db/thread_db_int.h
+++ b/lib/libthread_db/thread_db_int.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/lib/libufs/block.c b/lib/libufs/block.c
index 7accc8863693..4ea9b1be9b5b 100644
--- a/lib/libufs/block.c
+++ b/lib/libufs/block.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c
index 41fe587531bf..5f2902dc3697 100644
--- a/lib/libufs/cgroup.c
+++ b/lib/libufs/cgroup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Juli Mallett. All rights reserved.
*
diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c
index 497ff4c854f6..e40efd7bdbcc 100644
--- a/lib/libufs/inode.c
+++ b/lib/libufs/inode.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h
index 8160fdcd68a9..e90a38e5fe66 100644
--- a/lib/libufs/libufs.h
+++ b/lib/libufs/libufs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
diff --git a/lib/libufs/sblock.c b/lib/libufs/sblock.c
index 1d687d6d41aa..d93affa0d554 100644
--- a/lib/libufs/sblock.c
+++ b/lib/libufs/sblock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
diff --git a/lib/libufs/type.c b/lib/libufs/type.c
index 653ef8ceeea1..cbd98f522304 100644
--- a/lib/libufs/type.c
+++ b/lib/libufs/type.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Juli Mallett. All rights reserved.
*
diff --git a/lib/libugidfw/ugidfw.c b/lib/libugidfw/ugidfw.c
index 4fc09bbb163f..b270ed95a95c 100644
--- a/lib/libugidfw/ugidfw.c
+++ b/lib/libugidfw/ugidfw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2005 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libugidfw/ugidfw.h b/lib/libugidfw/ugidfw.h
index 107626c1aad4..24b2146e5f80 100644
--- a/lib/libugidfw/ugidfw.h
+++ b/lib/libugidfw/ugidfw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/libulog/ulog.h b/lib/libulog/ulog.h
index f29f275b9c78..c38531a46b65 100644
--- a/lib/libulog/ulog.h
+++ b/lib/libulog/ulog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libulog/ulog_login.c b/lib/libulog/ulog_login.c
index 7e86220cf584..ce2cd31b3a27 100644
--- a/lib/libulog/ulog_login.c
+++ b/lib/libulog/ulog_login.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libulog/ulog_login_pseudo.c b/lib/libulog/ulog_login_pseudo.c
index be6978740350..a67a3822f02f 100644
--- a/lib/libulog/ulog_login_pseudo.c
+++ b/lib/libulog/ulog_login_pseudo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libulog/utempter.c b/lib/libulog/utempter.c
index 9d8fc0b35169..8a663ee969c8 100644
--- a/lib/libulog/utempter.c
+++ b/lib/libulog/utempter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libulog/utempter.h b/lib/libulog/utempter.h
index 272fee81a318..e4a15725414e 100644
--- a/lib/libulog/utempter.h
+++ b/lib/libulog/utempter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 28fbece4955a..28542881a558 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
diff --git a/lib/libusb/libusb01.c b/lib/libusb/libusb01.c
index 8b2031e0b804..46370b7250ae 100644
--- a/lib/libusb/libusb01.c
+++ b/lib/libusb/libusb01.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 793152a30910..fb82e99b6d52 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2009-2023 Hans Petter Selasky
diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h
index 5caa56666c32..18c8aab9e5dc 100644
--- a/lib/libusb/libusb10.h
+++ b/lib/libusb/libusb10.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c
index b0866a78b791..f73d9756685b 100644
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c
index 0e32fc31c8e0..fff76475390e 100644
--- a/lib/libusb/libusb10_io.c
+++ b/lib/libusb/libusb10_io.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
diff --git a/lib/libusb/libusb20.c b/lib/libusb/libusb20.c
index 60a5f8448888..6527b1d17ea2 100644
--- a/lib/libusb/libusb20.c
+++ b/lib/libusb/libusb20.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb20.h b/lib/libusb/libusb20.h
index 52684aa802d5..868e8d7a4fdd 100644
--- a/lib/libusb/libusb20.h
+++ b/lib/libusb/libusb20.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
diff --git a/lib/libusb/libusb20_desc.c b/lib/libusb/libusb20_desc.c
index 3052af09e9c2..3408a90690ca 100644
--- a/lib/libusb/libusb20_desc.c
+++ b/lib/libusb/libusb20_desc.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb20_desc.h b/lib/libusb/libusb20_desc.h
index bb7724294cb4..ca0ebdccbf06 100644
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
diff --git a/lib/libusb/libusb20_int.h b/lib/libusb/libusb20_int.h
index 16796dc1233d..8f3b19d79e18 100644
--- a/lib/libusb/libusb20_int.h
+++ b/lib/libusb/libusb20_int.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb20_ugen20.c b/lib/libusb/libusb20_ugen20.c
index efffff2b5ef0..fe96509682f9 100644
--- a/lib/libusb/libusb20_ugen20.c
+++ b/lib/libusb/libusb20_ugen20.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/libusb_global_linux.h b/lib/libusb/libusb_global_linux.h
index 3e83bb2a6ea4..2d5446001b96 100644
--- a/lib/libusb/libusb_global_linux.h
+++ b/lib/libusb/libusb_global_linux.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libusb/usb.h b/lib/libusb/usb.h
index 1a71029e9c0e..01f742472ca5 100644
--- a/lib/libusb/usb.h
+++ b/lib/libusb/usb.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index ddc8eec0fad3..44ff1cccd256 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Simple authentication database handling code.
*
diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c
index 77db2266f5e2..f34db013ff18 100644
--- a/lib/libutil/expand_number.c
+++ b/lib/libutil/expand_number.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Eric Anderson <anderson@FreeBSD.org>
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c
index 485eee4c1109..fed233c00b76 100644
--- a/lib/libutil/flopen.c
+++ b/lib/libutil/flopen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
* All rights reserved.
diff --git a/lib/libutil/getlocalbase.3 b/lib/libutil/getlocalbase.3
index 50466123ee89..504b39b0235b 100644
--- a/lib/libutil/getlocalbase.3
+++ b/lib/libutil/getlocalbase.3
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright 2020 Scott Long
.\" Copyright 2020 Stefan Eßer
diff --git a/lib/libutil/gr_util.c b/lib/libutil/gr_util.c
index bab4143be731..ee55b92c89c3 100644
--- a/lib/libutil/gr_util.c
+++ b/lib/libutil/gr_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Sean C. Farley <scf@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index e03a9b9ad0ae..985709e4fc9a 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -1,7 +1,7 @@
/* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
* Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
diff --git a/lib/libutil/kinfo_getallproc.c b/lib/libutil/kinfo_getallproc.c
index 609d77a259ac..4e804770a1d1 100644
--- a/lib/libutil/kinfo_getallproc.c
+++ b/lib/libutil/kinfo_getallproc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2009 Ulf Lilleengen
diff --git a/lib/libutil/kinfo_getproc.c b/lib/libutil/kinfo_getproc.c
index e34fdbdf18e8..bf742ddb6b69 100644
--- a/lib/libutil/kinfo_getproc.c
+++ b/lib/libutil/kinfo_getproc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ulf Lilleengen
* All rights reserved.
diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c
index 970ee50e2936..9b55c4042976 100644
--- a/lib/libutil/kld.c
+++ b/lib/libutil/kld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Dag-Erling Coïdan Smørgrav
* All rights reserved.
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index b5ab10e6be85..469255ac46c6 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Brian Fundakowski Feldman
* All rights reserved.
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index eaa9379267db..a4b60750b282 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index f65a970e685b..472fd906c1f5 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
*
* Simple property list handling code.
diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c
index 84b4d0d351bc..0ee555a9616d 100644
--- a/lib/libutil/quotafile.c
+++ b/lib/libutil/quotafile.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008 Marshall Kirk McKusick
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 31dd1a50445c..884e19f99bf6 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index 55d6e0c45fba..fa201454779e 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Brian Fundakowski Feldman
* All rights reserved.
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index a783070bcd8c..38c7c6052644 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* Based on original work by Atsushi Murai <amurai@FreeBSD.org>
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
index 9f69c79561ad..48d8ea1ab02c 100644
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h
index 1be1f19507a9..a9d30d1b69bd 100644
--- a/lib/libvmmapi/vmmapi.h
+++ b/lib/libvmmapi/vmmapi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/lib/libvmmapi/vmmapi_freebsd.c b/lib/libvmmapi/vmmapi_freebsd.c
index adb7717d19fe..4127e2ca1f34 100644
--- a/lib/libvmmapi/vmmapi_freebsd.c
+++ b/lib/libvmmapi/vmmapi_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/lib/liby/yyerror.h b/lib/liby/yyerror.h
index 74800b111ce6..c023c0b7cd46 100644
--- a/lib/liby/yyerror.h
+++ b/lib/liby/yyerror.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Eitan Adler
*
diff --git a/lib/libypclnt/ypclnt_passwd.c b/lib/libypclnt/ypclnt_passwd.c
index cbabb2ed456d..e25e7505b6f5 100644
--- a/lib/libypclnt/ypclnt_passwd.c
+++ b/lib/libypclnt/ypclnt_passwd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/lib/msun/amd64/fenv.c b/lib/msun/amd64/fenv.c
index e964be8660ce..30c4debdaa62 100644
--- a/lib/msun/amd64/fenv.c
+++ b/lib/msun/amd64/fenv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c
index a2250b6fe016..22183fe07ca2 100644
--- a/lib/msun/arm/fenv.c
+++ b/lib/msun/arm/fenv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* Copyright (c) 2013 Andrew Turner <andrew@FreeBSD.ORG>
diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h
index 1e1bcbcb417b..3f41ed184bad 100644
--- a/lib/msun/arm/fenv.h
+++ b/lib/msun/arm/fenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/i387/fenv.c b/lib/msun/i387/fenv.c
index 3ff9f8cc3f42..a9910e0face2 100644
--- a/lib/msun/i387/fenv.c
+++ b/lib/msun/i387/fenv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/i387/invtrig.c b/lib/msun/i387/invtrig.c
index 425a2d14d7e8..d300663b282d 100644
--- a/lib/msun/i387/invtrig.c
+++ b/lib/msun/i387/invtrig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld128/invtrig.c b/lib/msun/ld128/invtrig.c
index ab93732c8dc8..3ba767ba598a 100644
--- a/lib/msun/ld128/invtrig.c
+++ b/lib/msun/ld128/invtrig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld128/invtrig.h b/lib/msun/ld128/invtrig.h
index 423b56847031..3f505c5dcec8 100644
--- a/lib/msun/ld128/invtrig.h
+++ b/lib/msun/ld128/invtrig.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld128/k_expl.h b/lib/msun/ld128/k_expl.h
index 159338fe3f81..3faf7a7f097a 100644
--- a/lib/msun/ld128/k_expl.h
+++ b/lib/msun/ld128/k_expl.h
@@ -1,7 +1,7 @@
/* from: FreeBSD: head/lib/msun/ld128/s_expl.c 251345 2013-06-03 20:09:22Z kargl */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/ld128/s_cexpl.c b/lib/msun/ld128/s_cexpl.c
index 24f5e3792115..a7b81c764153 100644
--- a/lib/msun/ld128/s_cexpl.c
+++ b/lib/msun/ld128/s_cexpl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Steven G. Kargl <kargl@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld128/s_exp2l.c b/lib/msun/ld128/s_exp2l.c
index ee3d2c782cf8..bcbdc5f50170 100644
--- a/lib/msun/ld128/s_exp2l.c
+++ b/lib/msun/ld128/s_exp2l.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c
index 5b786af4948e..5fc43802b950 100644
--- a/lib/msun/ld128/s_expl.c
+++ b/lib/msun/ld128/s_expl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c
index 4774a271e7ad..40a22c0f1a8c 100644
--- a/lib/msun/ld128/s_logl.c
+++ b/lib/msun/ld128/s_logl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2013 Bruce D. Evans
* All rights reserved.
diff --git a/lib/msun/ld128/s_nanl.c b/lib/msun/ld128/s_nanl.c
index 45d10e5a8871..cde3f18d326e 100644
--- a/lib/msun/ld128/s_nanl.c
+++ b/lib/msun/ld128/s_nanl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 David Schultz
* All rights reserved.
diff --git a/lib/msun/ld80/invtrig.c b/lib/msun/ld80/invtrig.c
index 5c8047857dab..879009b0c7b2 100644
--- a/lib/msun/ld80/invtrig.c
+++ b/lib/msun/ld80/invtrig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld80/invtrig.h b/lib/msun/ld80/invtrig.h
index be06a044bdbf..8d35d2c30ec1 100644
--- a/lib/msun/ld80/invtrig.h
+++ b/lib/msun/ld80/invtrig.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld80/k_expl.h b/lib/msun/ld80/k_expl.h
index a744d2d38127..b93fef8440dc 100644
--- a/lib/msun/ld80/k_expl.h
+++ b/lib/msun/ld80/k_expl.h
@@ -1,7 +1,7 @@
/* from: FreeBSD: head/lib/msun/ld80/s_expl.c 251343 2013-06-03 19:51:32Z kargl */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/ld80/s_cexpl.c b/lib/msun/ld80/s_cexpl.c
index 5cc35f6d2514..2d7624fac337 100644
--- a/lib/msun/ld80/s_cexpl.c
+++ b/lib/msun/ld80/s_cexpl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld80/s_exp2l.c b/lib/msun/ld80/s_exp2l.c
index 421d6e2e04b4..a7125e4162ea 100644
--- a/lib/msun/ld80/s_exp2l.c
+++ b/lib/msun/ld80/s_exp2l.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c
index e46e73f0c1fa..0571377a3f8d 100644
--- a/lib/msun/ld80/s_expl.c
+++ b/lib/msun/ld80/s_expl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c
index c74519cafd69..dac5bfb9e25e 100644
--- a/lib/msun/ld80/s_logl.c
+++ b/lib/msun/ld80/s_logl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2013 Bruce D. Evans
* All rights reserved.
diff --git a/lib/msun/ld80/s_nanl.c b/lib/msun/ld80/s_nanl.c
index ffc835a10e65..2d9403994b9c 100644
--- a/lib/msun/ld80/s_nanl.c
+++ b/lib/msun/ld80/s_nanl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 David Schultz
* All rights reserved.
diff --git a/lib/msun/mips/fenv.c b/lib/msun/mips/fenv.c
index 24c79a508aeb..d5cd7479982d 100644
--- a/lib/msun/mips/fenv.c
+++ b/lib/msun/mips/fenv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/mips/fenv.h b/lib/msun/mips/fenv.h
index be846b7449ce..2129b4299b00 100644
--- a/lib/msun/mips/fenv.h
+++ b/lib/msun/mips/fenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/powerpc/fenv.c b/lib/msun/powerpc/fenv.c
index f33493a5df2b..b5114b2f216e 100644
--- a/lib/msun/powerpc/fenv.c
+++ b/lib/msun/powerpc/fenv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/powerpc/fenv.h b/lib/msun/powerpc/fenv.h
index 83ba6b356af5..ac0e4ba7d8c3 100644
--- a/lib/msun/powerpc/fenv.h
+++ b/lib/msun/powerpc/fenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/catrig.c b/lib/msun/src/catrig.c
index 431d8e6742fe..82061b5ba433 100644
--- a/lib/msun/src/catrig.c
+++ b/lib/msun/src/catrig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Stephen Montgomery-Smith <stephen@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/catrigf.c b/lib/msun/src/catrigf.c
index 62bcd3995603..fb4a6bf5d471 100644
--- a/lib/msun/src/catrigf.c
+++ b/lib/msun/src/catrigf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Stephen Montgomery-Smith <stephen@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/e_remainderl.c b/lib/msun/src/e_remainderl.c
index 4a6786309f2f..229567334567 100644
--- a/lib/msun/src/e_remainderl.c
+++ b/lib/msun/src/e_remainderl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/e_sqrtl.c b/lib/msun/src/e_sqrtl.c
index 565d963963c1..67c777f960d7 100644
--- a/lib/msun/src/e_sqrtl.c
+++ b/lib/msun/src/e_sqrtl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/fenv-softfloat.h b/lib/msun/src/fenv-softfloat.h
index 014d1276922a..ba1b89efd6ca 100644
--- a/lib/msun/src/fenv-softfloat.h
+++ b/lib/msun/src/fenv-softfloat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/imprecise.c b/lib/msun/src/imprecise.c
index 1c995ab6d6c6..fa6d9837a00b 100644
--- a/lib/msun/src/imprecise.c
+++ b/lib/msun/src/imprecise.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/lib/msun/src/k_exp.c b/lib/msun/src/k_exp.c
index dd15ff4cb0ed..1b86cd6852d3 100644
--- a/lib/msun/src/k_exp.c
+++ b/lib/msun/src/k_exp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/k_expf.c b/lib/msun/src/k_expf.c
index 80e629b0f3d6..7071632c35c8 100644
--- a/lib/msun/src/k_expf.c
+++ b/lib/msun/src/k_expf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_carg.c b/lib/msun/src/s_carg.c
index 1611b9de3387..f203198ecbc7 100644
--- a/lib/msun/src/s_carg.c
+++ b/lib/msun/src/s_carg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_cargf.c b/lib/msun/src/s_cargf.c
index 71c705daa0c9..6ea487cdb88d 100644
--- a/lib/msun/src/s_cargf.c
+++ b/lib/msun/src/s_cargf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_cargl.c b/lib/msun/src/s_cargl.c
index 96c3336bd1c2..ba3943822f66 100644
--- a/lib/msun/src/s_cargl.c
+++ b/lib/msun/src/s_cargl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_ccosh.c b/lib/msun/src/s_ccosh.c
index 7652b3c49886..0fd9206da349 100644
--- a/lib/msun/src/s_ccosh.c
+++ b/lib/msun/src/s_ccosh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_ccoshf.c b/lib/msun/src/s_ccoshf.c
index 5d7a09ba5f8d..2db840362bad 100644
--- a/lib/msun/src/s_ccoshf.c
+++ b/lib/msun/src/s_ccoshf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_cexp.c b/lib/msun/src/s_cexp.c
index a1f853eca4cc..8db763d9f8ee 100644
--- a/lib/msun/src/s_cexp.c
+++ b/lib/msun/src/s_cexp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_cexpf.c b/lib/msun/src/s_cexpf.c
index d905b74ff4bd..7247301704e3 100644
--- a/lib/msun/src/s_cexpf.c
+++ b/lib/msun/src/s_cexpf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_cimag.c b/lib/msun/src/s_cimag.c
index 1f383cb2aae6..0b14fd7d221c 100644
--- a/lib/msun/src/s_cimag.c
+++ b/lib/msun/src/s_cimag.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_cimagf.c b/lib/msun/src/s_cimagf.c
index 86a43c116987..42a1efd5272f 100644
--- a/lib/msun/src/s_cimagf.c
+++ b/lib/msun/src/s_cimagf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_cimagl.c b/lib/msun/src/s_cimagl.c
index 6d879505820a..9707bc3460cd 100644
--- a/lib/msun/src/s_cimagl.c
+++ b/lib/msun/src/s_cimagl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_conj.c b/lib/msun/src/s_conj.c
index dc56f48b217b..a83abd8feb14 100644
--- a/lib/msun/src/s_conj.c
+++ b/lib/msun/src/s_conj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_conjf.c b/lib/msun/src/s_conjf.c
index 3fd8b8f02c6a..f9eb146e8bc3 100644
--- a/lib/msun/src/s_conjf.c
+++ b/lib/msun/src/s_conjf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_conjl.c b/lib/msun/src/s_conjl.c
index d2f8d0fd3700..4b86f2e8b3a1 100644
--- a/lib/msun/src/s_conjl.c
+++ b/lib/msun/src/s_conjl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_copysignl.c b/lib/msun/src/s_copysignl.c
index bd6744705587..666a2ba1d4c5 100644
--- a/lib/msun/src/s_copysignl.c
+++ b/lib/msun/src/s_copysignl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_cosl.c b/lib/msun/src/s_cosl.c
index 3d066483f227..6f0b36f479e6 100644
--- a/lib/msun/src/s_cosl.c
+++ b/lib/msun/src/s_cosl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_cproj.c b/lib/msun/src/s_cproj.c
index 38e774723e86..5b0d4ed0636c 100644
--- a/lib/msun/src/s_cproj.c
+++ b/lib/msun/src/s_cproj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_cprojf.c b/lib/msun/src/s_cprojf.c
index af4c3a80ce5e..0d76e75c70fc 100644
--- a/lib/msun/src/s_cprojf.c
+++ b/lib/msun/src/s_cprojf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_cprojl.c b/lib/msun/src/s_cprojl.c
index 16df514f3671..7fc35d212f5c 100644
--- a/lib/msun/src/s_cprojl.c
+++ b/lib/msun/src/s_cprojl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_creal.c b/lib/msun/src/s_creal.c
index 69a10f2790df..5c8734ed7101 100644
--- a/lib/msun/src/s_creal.c
+++ b/lib/msun/src/s_creal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_crealf.c b/lib/msun/src/s_crealf.c
index 83e4d4632dc1..a93421f124d6 100644
--- a/lib/msun/src/s_crealf.c
+++ b/lib/msun/src/s_crealf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_creall.c b/lib/msun/src/s_creall.c
index 538b7d53d191..b4eb9ef9bec6 100644
--- a/lib/msun/src/s_creall.c
+++ b/lib/msun/src/s_creall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Stefan Farfeleder
* All rights reserved.
diff --git a/lib/msun/src/s_csinh.c b/lib/msun/src/s_csinh.c
index 09b2dcbecb7b..b3928ce87eb2 100644
--- a/lib/msun/src/s_csinh.c
+++ b/lib/msun/src/s_csinh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_csinhf.c b/lib/msun/src/s_csinhf.c
index ba1a79497fc6..a8d6f2d1da59 100644
--- a/lib/msun/src/s_csinhf.c
+++ b/lib/msun/src/s_csinhf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Bruce D. Evans and Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_csqrt.c b/lib/msun/src/s_csqrt.c
index d172efc75651..d96c34446f1f 100644
--- a/lib/msun/src/s_csqrt.c
+++ b/lib/msun/src/s_csqrt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_csqrtf.c b/lib/msun/src/s_csqrtf.c
index 6836a3903c25..e3ef4d0f65a7 100644
--- a/lib/msun/src/s_csqrtf.c
+++ b/lib/msun/src/s_csqrtf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_csqrtl.c b/lib/msun/src/s_csqrtl.c
index 40bc59df40ff..d5641337d036 100644
--- a/lib/msun/src/s_csqrtl.c
+++ b/lib/msun/src/s_csqrtl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_ctanh.c b/lib/msun/src/s_ctanh.c
index e5840a1bf67b..aa4e10c749a3 100644
--- a/lib/msun/src/s_ctanh.c
+++ b/lib/msun/src/s_ctanh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz
* All rights reserved.
diff --git a/lib/msun/src/s_ctanhf.c b/lib/msun/src/s_ctanhf.c
index c46f86d2e116..e9ebe4f01037 100644
--- a/lib/msun/src/s_ctanhf.c
+++ b/lib/msun/src/s_ctanhf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David Schultz
* All rights reserved.
diff --git a/lib/msun/src/s_exp2.c b/lib/msun/src/s_exp2.c
index bc36e5564a8e..1dd9673dcc75 100644
--- a/lib/msun/src/s_exp2.c
+++ b/lib/msun/src/s_exp2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_exp2f.c b/lib/msun/src/s_exp2f.c
index c082924af5d3..c5b4c8e60e28 100644
--- a/lib/msun/src/s_exp2f.c
+++ b/lib/msun/src/s_exp2f.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fdim.c b/lib/msun/src/s_fdim.c
index c40c3e9d32ae..b81dbacbfce0 100644
--- a/lib/msun/src/s_fdim.c
+++ b/lib/msun/src/s_fdim.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c
index 95cffd0ba36d..2fd7075a7f5a 100644
--- a/lib/msun/src/s_fma.c
+++ b/lib/msun/src/s_fma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c
index 4591cc219bbb..ae979cb4a0af 100644
--- a/lib/msun/src/s_fmaf.c
+++ b/lib/msun/src/s_fmaf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c
index a379346c171f..a0622a295531 100644
--- a/lib/msun/src/s_fmal.c
+++ b/lib/msun/src/s_fmal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c
index b53b1e64da04..42bd11c426d0 100644
--- a/lib/msun/src/s_fmax.c
+++ b/lib/msun/src/s_fmax.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c
index 8d3d14f4b52a..10667d382798 100644
--- a/lib/msun/src/s_fmaxf.c
+++ b/lib/msun/src/s_fmaxf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fmaxl.c b/lib/msun/src/s_fmaxl.c
index c0d7c88325c7..bf42587824d5 100644
--- a/lib/msun/src/s_fmaxl.c
+++ b/lib/msun/src/s_fmaxl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c
index 53f36c1c2d3d..e79071d2faa7 100644
--- a/lib/msun/src/s_fmin.c
+++ b/lib/msun/src/s_fmin.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c
index 58b6a489b820..19ffd4289467 100644
--- a/lib/msun/src/s_fminf.c
+++ b/lib/msun/src/s_fminf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_fminl.c b/lib/msun/src/s_fminl.c
index 97604b38b487..c906f1d3eb6c 100644
--- a/lib/msun/src/s_fminl.c
+++ b/lib/msun/src/s_fminl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_frexpl.c b/lib/msun/src/s_frexpl.c
index 66e284fdd07d..7101615168fb 100644
--- a/lib/msun/src/s_frexpl.c
+++ b/lib/msun/src/s_frexpl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_isfinite.c b/lib/msun/src/s_isfinite.c
index 838d8b2e9d70..4619f330afc0 100644
--- a/lib/msun/src/s_isfinite.c
+++ b/lib/msun/src/s_isfinite.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c
index ea3c8db67da6..5272dfd7f29f 100644
--- a/lib/msun/src/s_isnan.c
+++ b/lib/msun/src/s_isnan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_isnormal.c b/lib/msun/src/s_isnormal.c
index eb57c8a37b1e..4d63b28b165d 100644
--- a/lib/msun/src/s_isnormal.c
+++ b/lib/msun/src/s_isnormal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_lrint.c b/lib/msun/src/s_lrint.c
index ad9b978fa8f4..be00cbb6a91a 100644
--- a/lib/msun/src/s_lrint.c
+++ b/lib/msun/src/s_lrint.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_lround.c b/lib/msun/src/s_lround.c
index 1dd8e697f703..00f4b95aeb89 100644
--- a/lib/msun/src/s_lround.c
+++ b/lib/msun/src/s_lround.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_modfl.c b/lib/msun/src/s_modfl.c
index 2d83bbe339df..8e5c4d380bdf 100644
--- a/lib/msun/src/s_modfl.c
+++ b/lib/msun/src/s_modfl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_nan.c b/lib/msun/src/s_nan.c
index 17692445ac52..1345f22a0ea1 100644
--- a/lib/msun/src/s_nan.c
+++ b/lib/msun/src/s_nan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 David Schultz
* All rights reserved.
diff --git a/lib/msun/src/s_nearbyint.c b/lib/msun/src/s_nearbyint.c
index 796dbaf98443..ae6ffdecd474 100644
--- a/lib/msun/src/s_nearbyint.c
+++ b/lib/msun/src/s_nearbyint.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_rintl.c b/lib/msun/src/s_rintl.c
index 1e9824d83b49..790edbcf6204 100644
--- a/lib/msun/src/s_rintl.c
+++ b/lib/msun/src/s_rintl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index ca25f8efd5ec..a112bc592392 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index 5bbf6b33b631..bb6f77c78c34 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index 8d1c02a7f840..9e85423a54ea 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index c27420c9297b..e8c637793f44 100644
--- a/lib/msun/src/s_scalbln.c
+++ b/lib/msun/src/s_scalbln.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/src/s_signbit.c b/lib/msun/src/s_signbit.c
index 123bcbc6471b..b065ce58e5a5 100644
--- a/lib/msun/src/s_signbit.c
+++ b/lib/msun/src/s_signbit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/lib/msun/src/s_sinl.c b/lib/msun/src/s_sinl.c
index f1ef84c8cae7..c5ee10679b92 100644
--- a/lib/msun/src/s_sinl.c
+++ b/lib/msun/src/s_sinl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_tanl.c b/lib/msun/src/s_tanl.c
index 0c5228ec8f9e..c21e38d7f712 100644
--- a/lib/msun/src/s_tanl.c
+++ b/lib/msun/src/s_tanl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Steven G. Kargl
* All rights reserved.
diff --git a/lib/msun/src/s_tgammaf.c b/lib/msun/src/s_tgammaf.c
index 1fd46e8098d3..6cbd356a87c1 100644
--- a/lib/msun/src/s_tgammaf.c
+++ b/lib/msun/src/s_tgammaf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/lib/msun/x86/fenv.h b/lib/msun/x86/fenv.h
index bb37998e0c77..8fe10913f4bc 100644
--- a/lib/msun/x86/fenv.h
+++ b/lib/msun/x86/fenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 15e163e027bc..f0ae6b45e868 100644
--- a/libexec/atrun/gloadavg.h
+++ b/libexec/atrun/gloadavg.h
@@ -2,7 +2,7 @@
* gloadavg.h - header for atrun(8)
* Copyright (C) 1993 Thomas Koenig
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/libexec/phttpget/phttpget.c b/libexec/phttpget/phttpget.c
index 17935b122535..714f609d1fac 100644
--- a/libexec/phttpget/phttpget.c
+++ b/libexec/phttpget/phttpget.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2005 Colin Percival
* All rights reserved
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 5e56af7522e1..3ff845ce9757 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index e1e24bc462d6..2fdc10ad915f 100644
--- a/libexec/rtld-elf/amd64/reloc.c
+++ b/libexec/rtld-elf/amd64/reloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996, 1997, 1998, 1999 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h
index 99f020e60221..1543ff67a08e 100644
--- a/libexec/rtld-elf/amd64/rtld_machdep.h
+++ b/libexec/rtld-elf/amd64/rtld_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h
index c9ec047ec34e..b25472aaf024 100644
--- a/libexec/rtld-elf/arm/rtld_machdep.h
+++ b/libexec/rtld-elf/arm/rtld_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index 20a47b2725bd..3aff42a557c9 100644
--- a/libexec/rtld-elf/debug.c
+++ b/libexec/rtld-elf/debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index 4dcefbabdb45..95c06c7babc3 100644
--- a/libexec/rtld-elf/debug.h
+++ b/libexec/rtld-elf/debug.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index f7123f91f6fb..bd8595f923df 100644
--- a/libexec/rtld-elf/i386/reloc.c
+++ b/libexec/rtld-elf/i386/reloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996, 1997, 1998, 1999 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index ee41e31bd591..f5f424127d80 100644
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index 149b8945bf35..25c7068b2f2d 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/mips/rtld_machdep.h b/libexec/rtld-elf/mips/rtld_machdep.h
index 2826a56f34c1..55b9ae80e005 100644
--- a/libexec/rtld-elf/mips/rtld_machdep.h
+++ b/libexec/rtld-elf/mips/rtld_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/powerpc/rtld_machdep.h b/libexec/rtld-elf/powerpc/rtld_machdep.h
index b3e2e3fafa9f..cf3e65dcbf64 100644
--- a/libexec/rtld-elf/powerpc/rtld_machdep.h
+++ b/libexec/rtld-elf/powerpc/rtld_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/powerpc64/rtld_machdep.h b/libexec/rtld-elf/powerpc64/rtld_machdep.h
index c8dcebe45ae2..e88a87197650 100644
--- a/libexec/rtld-elf/powerpc64/rtld_machdep.h
+++ b/libexec/rtld-elf/powerpc64/rtld_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 91b09b5fbd25..db53fbeb7d08 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
* Copyright 2003 Alexander Kabaev <kan@FreeBSD.ORG>.
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 9bc75dc97546..ca43b289566f 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
index 9da8a8daccf9..10473618f787 100644
--- a/libexec/rtld-elf/rtld_lock.c
+++ b/libexec/rtld-elf/rtld_lock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1999, 2000 John D. Polstra.
* All rights reserved.
diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h
index c88b558b72b8..39277bc7c155 100644
--- a/libexec/rtld-elf/rtld_lock.h
+++ b/libexec/rtld-elf/rtld_lock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003 Alexander Kabaev.
* All rights reserved.
diff --git a/libexec/rtld-elf/rtld_malloc.h b/libexec/rtld-elf/rtld_malloc.h
index a8eb25272a57..961595685f07 100644
--- a/libexec/rtld-elf/rtld_malloc.h
+++ b/libexec/rtld-elf/rtld_malloc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
* All rights reserved.
diff --git a/libexec/rtld-elf/rtld_printf.h b/libexec/rtld-elf/rtld_printf.h
index e2fac948dc53..a9e808062ab5 100644
--- a/libexec/rtld-elf/rtld_printf.h
+++ b/libexec/rtld-elf/rtld_printf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2011 Konstantin Belousov <kib@FreeBSD.org>.
* All rights reserved.
diff --git a/libexec/rtld-elf/rtld_tls.h b/libexec/rtld-elf/rtld_tls.h
index 01b26707159a..84ee582152c7 100644
--- a/libexec/rtld-elf/rtld_tls.h
+++ b/libexec/rtld-elf/rtld_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/libexec/rtld-elf/tests/common.c b/libexec/rtld-elf/tests/common.c
index 6eb3edfbc14c..afdf27fe1ef7 100644
--- a/libexec/rtld-elf/tests/common.c
+++ b/libexec/rtld-elf/tests/common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
* Copyright 2014 Jonathan Anderson.
* Copyright 2021 Mariusz Zaborski <oshogbo@FreeBSD.org>
*
diff --git a/libexec/rtld-elf/tests/common.h b/libexec/rtld-elf/tests/common.h
index d5bf2050dcfd..68bbfdb7022f 100644
--- a/libexec/rtld-elf/tests/common.h
+++ b/libexec/rtld-elf/tests/common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
* Copyright 2014 Jonathan Anderson.
* Copyright 2021 Mariusz Zaborski <oshogbo@vexillium.org>
*
diff --git a/libexec/rtld-elf/tests/ld_preload_fds.c b/libexec/rtld-elf/tests/ld_preload_fds.c
index 3a220b009bb6..c7365e8214d7 100644
--- a/libexec/rtld-elf/tests/ld_preload_fds.c
+++ b/libexec/rtld-elf/tests/ld_preload_fds.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
* Copyright 2021 Mariusz Zaborski <oshogbo@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index 1ee3e1c3a74f..8d00fe78926d 100644
--- a/libexec/rtld-elf/xmalloc.c
+++ b/libexec/rtld-elf/xmalloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/libexec/save-entropy/save-entropy.sh b/libexec/save-entropy/save-entropy.sh
index 00a0ab04e7d3..9b2f14148cc5 100755
--- a/libexec/save-entropy/save-entropy.sh
+++ b/libexec/save-entropy/save-entropy.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2001-2006,2012 Douglas Barton, dougb@FreeBSD.org
# All rights reserved.
diff --git a/libexec/talkd/extern.h b/libexec/talkd/extern.h
index f81efe721029..be89923a0cd5 100644
--- a/libexec/talkd/extern.h
+++ b/libexec/talkd/extern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c
index 8c35daf5cd65..701b7cbe8d06 100644
--- a/libexec/tftpd/tests/functional.c
+++ b/libexec/tftpd/tests/functional.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Alan Somers.
*
diff --git a/libexec/tftpd/tftp-file.c b/libexec/tftpd/tftp-file.c
index 4ca075836f8d..de34e321ae23 100644
--- a/libexec/tftpd/tftp-file.c
+++ b/libexec/tftpd/tftp-file.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-file.h b/libexec/tftpd/tftp-file.h
index c9ce5e33b723..895bc802b69d 100644
--- a/libexec/tftpd/tftp-file.h
+++ b/libexec/tftpd/tftp-file.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c
index 459a81508e2b..bee3e4e62525 100644
--- a/libexec/tftpd/tftp-io.c
+++ b/libexec/tftpd/tftp-io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-io.h b/libexec/tftpd/tftp-io.h
index 322747cc58e5..93fac3f897b2 100644
--- a/libexec/tftpd/tftp-io.h
+++ b/libexec/tftpd/tftp-io.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-options.c b/libexec/tftpd/tftp-options.c
index 10fb112654fd..96561db83050 100644
--- a/libexec/tftpd/tftp-options.c
+++ b/libexec/tftpd/tftp-options.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-options.h b/libexec/tftpd/tftp-options.h
index 713cbb12e439..3f695972d07c 100644
--- a/libexec/tftpd/tftp-options.h
+++ b/libexec/tftpd/tftp-options.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-transfer.c b/libexec/tftpd/tftp-transfer.c
index 0a0c099e4c33..501b7cec4933 100644
--- a/libexec/tftpd/tftp-transfer.c
+++ b/libexec/tftpd/tftp-transfer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-transfer.h b/libexec/tftpd/tftp-transfer.h
index a39b1eca86ce..5cf416333072 100644
--- a/libexec/tftpd/tftp-transfer.h
+++ b/libexec/tftpd/tftp-transfer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c
index d706639d51e8..de12fac774e5 100644
--- a/libexec/tftpd/tftp-utils.c
+++ b/libexec/tftpd/tftp-utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/tftpd/tftp-utils.h b/libexec/tftpd/tftp-utils.h
index 0d251874f1fc..7c7af13cf262 100644
--- a/libexec/tftpd/tftp-utils.h
+++ b/libexec/tftpd/tftp-utils.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
diff --git a/libexec/ulog-helper/ulog-helper.c b/libexec/ulog-helper/ulog-helper.c
index 3b525f4fe76e..47174f633060 100644
--- a/libexec/ulog-helper/ulog-helper.c
+++ b/libexec/ulog-helper/ulog-helper.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index e6cadcf7f189..cbe3d9b08250 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/sbin/adjkerntz/pathnames.h b/sbin/adjkerntz/pathnames.h
index 43356cd357a9..365cb672d9fd 100644
--- a/sbin/adjkerntz/pathnames.h
+++ b/sbin/adjkerntz/pathnames.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993 by Andrew A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8
index 79bdec751a86..cd11548c5202 100644
--- a/sbin/bectl/bectl.8
+++ b/sbin/bectl/bectl.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
.\"
diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c
index 2b7af4e55419..d3b0259a3898 100644
--- a/sbin/bectl/bectl.c
+++ b/sbin/bectl/bectl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle J. Kneitinger <kyle@kneit.in>
*
diff --git a/sbin/bectl/bectl.h b/sbin/bectl/bectl.h
index 878af24f0cbb..c160286b31ae 100644
--- a/sbin/bectl/bectl.h
+++ b/sbin/bectl/bectl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c
index 1d7d4a1496a2..1c56f718e7d9 100644
--- a/sbin/bectl/bectl_jail.c
+++ b/sbin/bectl/bectl_jail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sbin/bectl/bectl_list.c b/sbin/bectl/bectl_list.c
index e43c3000d8f2..e41dc970cf5f 100644
--- a/sbin/bectl/bectl_list.c
+++ b/sbin/bectl/bectl_list.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh
index b101591c3ee9..5f865b86954e 100755
--- a/sbin/bectl/tests/bectl_test.sh
+++ b/sbin/bectl/tests/bectl_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index 038c4a836878..4ff797560e05 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Sandvine Incorporated. All rights reserved.
* Copyright (c) 2002-2011 Andre Albsmeier <andre@albsmeier.net>
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 15e5c6608f47..b8c3d40faa3c 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Kelly Yancey <kbyanc@posi.net>
* Derived from work done by Julian Elischer <julian@tfs.com,
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 6bfb47b74c2d..98670e1c7ab4 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992 Christopher G. Demetriou
* All rights reserved.
diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c
index f4298eb8a2cc..5633720b7987 100644
--- a/sbin/conscontrol/conscontrol.c
+++ b/sbin/conscontrol/conscontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c
index a90a693e1b03..d886ce9bdc52 100644
--- a/sbin/ddb/ddb.c
+++ b/sbin/ddb/ddb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sbin/ddb/ddb.h b/sbin/ddb/ddb.h
index 6f9a6f99f04b..c21fceb31ee9 100644
--- a/sbin/ddb/ddb.h
+++ b/sbin/ddb/ddb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c
index 1bb27b5b7e93..3754e810e038 100644
--- a/sbin/ddb/ddb_capture.c
+++ b/sbin/ddb/ddb_capture.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Robert N. M. Watson
* All rights reserved.
diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c
index e36cb6606380..f110a7a16434 100644
--- a/sbin/ddb/ddb_script.c
+++ b/sbin/ddb/ddb_script.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index a1b6ee479921..542c40222e65 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause
*
* Copyright (c) 2002-2010 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index a291e8141298..4ba3888d3841 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -1,7 +1,7 @@
/*-
* DEVD (Device action daemon)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index 62511d8ec3a5..a21e873c1764 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2003 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index 9b8fd592045a..06faa1d69782 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -2,7 +2,7 @@
/*-
* DEVD (Device action daemon)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 30e48e815fe3..65b319f37936 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -2,7 +2,7 @@
/*-
* DEVD (Device action daemon)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index b5a6bf4015a2..5f6352064f1f 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2002 Dima Dorfman.
* All rights reserved.
diff --git a/sbin/devfs/extern.h b/sbin/devfs/extern.h
index c02a7afba30e..4fde53c2f82a 100644
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index 0bfc7ffaf3c8..9a7d100be128 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c
index f3af9f93825a..edfe4ae01ec9 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.c
+++ b/sbin/etherswitchcfg/etherswitchcfg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sbin/fdisk/fdisk_mbr_enc.c b/sbin/fdisk/fdisk_mbr_enc.c
index 1202896276c6..351fd3ef0a08 100644
--- a/sbin/fdisk/fdisk_mbr_enc.c
+++ b/sbin/fdisk/fdisk_mbr_enc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/sbin/fdisk/fdisk_mbr_enc.h b/sbin/fdisk/fdisk_mbr_enc.h
index 5a1a6bf70fce..e3ebcfcec93c 100644
--- a/sbin/fdisk/fdisk_mbr_enc.h
+++ b/sbin/fdisk/fdisk_mbr_enc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 4f77fc39f3f7..a32e6feb3bea 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause and BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause and BSD-2-Clause
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index cd2c9df878a8..f3bdd5a66907 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause
*
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index d1b6d8530ce6..c56d6f131af1 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2009, 2010 Jeffrey W. Roberson <jeff@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 887312ed7c41..3d1657ad66f3 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1995, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 9519315672ab..654ceeb9c5ca 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 471f6cc0335e..02c93c10faac 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Google LLC
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
diff --git a/sbin/fsck_msdosfs/dosfs.h b/sbin/fsck_msdosfs/dosfs.h
index d89a08689825..6016a5077dfd 100644
--- a/sbin/fsck_msdosfs/dosfs.h
+++ b/sbin/fsck_msdosfs/dosfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 532e840acfc8..1f6453dedb74 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index c4db8848f18b..ca9a808f6717 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -1,7 +1,7 @@
/* $OpenBSD: fsirand.c,v 1.9 1997/02/28 00:46:33 millert Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 421242c38c80..1a0ec7897814 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 9b43910b88f9..3980032448d3 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/geom/core/geom.h b/sbin/geom/core/geom.h
index a76021c8aca5..48dd6cd55821 100644
--- a/sbin/geom/core/geom.h
+++ b/sbin/geom/core/geom.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c
index 3985ae56edc6..6c0e3df9a06f 100644
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/geom/misc/subr.h b/sbin/geom/misc/subr.h
index 579c94c21491..6e86c5b24fa3 100644
--- a/sbin/geom/misc/subr.h
+++ b/sbin/geom/misc/subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index 0de8504ce3c4..5102700f7959 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c
index 7cacbf58037e..01138a3795d7 100644
--- a/sbin/ggate/ggated/ggated.c
+++ b/sbin/ggate/ggated/ggated.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ggate/ggatel/ggatel.c b/sbin/ggate/ggatel/ggatel.c
index 4659cacbee17..4b7d99c1ee72 100644
--- a/sbin/ggate/ggatel/ggatel.c
+++ b/sbin/ggate/ggatel/ggatel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index 2f544f7a2c9c..c1951d241a99 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index d399b247cd75..4950d6ca102c 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c
index 5a081e92a8df..336d51f93cf3 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Lukas Ertl
* Copyright (c) 2005 Chris Jones
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index 162ba2610991..b649ced1f29e 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c
index 73577d2764e9..439461f8b04a 100644
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/activemap.h b/sbin/hastd/activemap.h
index e42a37e0d96f..14f074c9f260 100644
--- a/sbin/hastd/activemap.h
+++ b/sbin/hastd/activemap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c
index 52e567a52879..61bec25b95e1 100644
--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/control.h b/sbin/hastd/control.h
index 18096162eb65..327474ca34ba 100644
--- a/sbin/hastd/control.h
+++ b/sbin/hastd/control.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c
index 83f99f834288..5e6e1bb558a1 100644
--- a/sbin/hastd/ebuf.c
+++ b/sbin/hastd/ebuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/ebuf.h b/sbin/hastd/ebuf.h
index 83500ed7f646..8dc1c69c1ff4 100644
--- a/sbin/hastd/ebuf.h
+++ b/sbin/hastd/ebuf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/event.c b/sbin/hastd/event.c
index 105939f123bf..b4548d3da190 100644
--- a/sbin/hastd/event.c
+++ b/sbin/hastd/event.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/event.h b/sbin/hastd/event.h
index c3773298794d..8a25c8474419 100644
--- a/sbin/hastd/event.h
+++ b/sbin/hastd/event.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/hastd/hast.h b/sbin/hastd/hast.h
index b1e2537a51f3..c8f27898abc5 100644
--- a/sbin/hastd/hast.h
+++ b/sbin/hastd/hast.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_checksum.c
index dccba3752cb1..f975d28f13f4 100644
--- a/sbin/hastd/hast_checksum.c
+++ b/sbin/hastd/hast_checksum.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_checksum.h b/sbin/hastd/hast_checksum.h
index ea37a2ff1a1a..4ddbb5df712d 100644
--- a/sbin/hastd/hast_checksum.h
+++ b/sbin/hastd/hast_checksum.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_compression.c b/sbin/hastd/hast_compression.c
index e6a2192c6a53..def7dd0ff29c 100644
--- a/sbin/hastd/hast_compression.c
+++ b/sbin/hastd/hast_compression.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_compression.h b/sbin/hastd/hast_compression.h
index b7ea66290bdd..094450ef2647 100644
--- a/sbin/hastd/hast_compression.h
+++ b/sbin/hastd/hast_compression.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sbin/hastd/hast_proto.c b/sbin/hastd/hast_proto.c
index 81dd01a21f17..0a85b46fa2c8 100644
--- a/sbin/hastd/hast_proto.c
+++ b/sbin/hastd/hast_proto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/hast_proto.h b/sbin/hastd/hast_proto.h
index 3a0a3fbdc884..bc3b0a476503 100644
--- a/sbin/hastd/hast_proto.h
+++ b/sbin/hastd/hast_proto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index be58411b7ec7..4f0acfeac9c0 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/hastd.h b/sbin/hastd/hastd.h
index 965a63d1cb6d..60167453e223 100644
--- a/sbin/hastd/hastd.h
+++ b/sbin/hastd/hastd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c
index 13890b5fcb10..e15e5df43ed5 100644
--- a/sbin/hastd/hooks.c
+++ b/sbin/hastd/hooks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sbin/hastd/hooks.h b/sbin/hastd/hooks.h
index 3ace6d35a7af..8f9861a46058 100644
--- a/sbin/hastd/hooks.h
+++ b/sbin/hastd/hooks.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sbin/hastd/lzf.c b/sbin/hastd/lzf.c
index 687cd0847cb5..2b0ee88b2cd3 100644
--- a/sbin/hastd/lzf.c
+++ b/sbin/hastd/lzf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
diff --git a/sbin/hastd/lzf.h b/sbin/hastd/lzf.h
index b3a3b0979e6b..2c7cd60be5b7 100644
--- a/sbin/hastd/lzf.h
+++ b/sbin/hastd/lzf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
diff --git a/sbin/hastd/metadata.c b/sbin/hastd/metadata.c
index 2d998b706c5a..2bdbb9612a8b 100644
--- a/sbin/hastd/metadata.c
+++ b/sbin/hastd/metadata.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/metadata.h b/sbin/hastd/metadata.h
index 4efd13ff7b87..693cc3ae836b 100644
--- a/sbin/hastd/metadata.h
+++ b/sbin/hastd/metadata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c
index 81def8aeb5cd..128db3f7f0ad 100644
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/nv.h b/sbin/hastd/nv.h
index 7d93a71b2a47..b1bb2042bf17 100644
--- a/sbin/hastd/nv.h
+++ b/sbin/hastd/nv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/parse.y b/sbin/hastd/parse.y
index 4e7687c8d23d..f1551a09b500 100644
--- a/sbin/hastd/parse.y
+++ b/sbin/hastd/parse.y
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c
index 9ac9a69b75da..d314f2b9e3b5 100644
--- a/sbin/hastd/pjdlog.c
+++ b/sbin/hastd/pjdlog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sbin/hastd/pjdlog.h b/sbin/hastd/pjdlog.h
index 6a1833db0187..7cb35999f95e 100644
--- a/sbin/hastd/pjdlog.h
+++ b/sbin/hastd/pjdlog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 620cb6e72720..99733a838de2 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 249da7d5e4ea..9e6b8a4c0670 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/proto.h b/sbin/hastd/proto.h
index b7f2d44adfd2..6b7007517647 100644
--- a/sbin/hastd/proto.h
+++ b/sbin/hastd/proto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c
index 5a927f563637..c6d4dbbedff9 100644
--- a/sbin/hastd/proto_common.c
+++ b/sbin/hastd/proto_common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h
index 2d035beee8b0..57a39384395a 100644
--- a/sbin/hastd/proto_impl.h
+++ b/sbin/hastd/proto_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c
index 9c4e9f1b12c9..a51b3e543517 100644
--- a/sbin/hastd/proto_socketpair.c
+++ b/sbin/hastd/proto_socketpair.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c
index d2bf98318af5..9ec0326c7daa 100644
--- a/sbin/hastd/proto_tcp.c
+++ b/sbin/hastd/proto_tcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c
index 5c18a2c43fcb..183f630ebb69 100644
--- a/sbin/hastd/proto_uds.c
+++ b/sbin/hastd/proto_uds.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/rangelock.c b/sbin/hastd/rangelock.c
index 129b82bedbfc..715aea122780 100644
--- a/sbin/hastd/rangelock.c
+++ b/sbin/hastd/rangelock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/rangelock.h b/sbin/hastd/rangelock.h
index 93281a382a26..86c6b8e05c57 100644
--- a/sbin/hastd/rangelock.h
+++ b/sbin/hastd/rangelock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h
index 8001570b7c85..1c240e1c4b94 100644
--- a/sbin/hastd/refcnt.h
+++ b/sbin/hastd/refcnt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index fa3142eb0d21..e9882dbc7f3a 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c
index 51e0a55e4191..1319a4d942cc 100644
--- a/sbin/hastd/subr.c
+++ b/sbin/hastd/subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/subr.h b/sbin/hastd/subr.h
index 93e344d0b181..1ab4afb5df55 100644
--- a/sbin/hastd/subr.h
+++ b/sbin/hastd/subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/hastd/synch.h b/sbin/hastd/synch.h
index 2644e54cebdc..807d28774f64 100644
--- a/sbin/hastd/synch.h
+++ b/sbin/hastd/synch.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
diff --git a/sbin/hastd/token.l b/sbin/hastd/token.l
index bc423e17b6e5..876ce891eff1 100644
--- a/sbin/hastd/token.l
+++ b/sbin/hastd/token.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c
index b6cda30dc06d..d1be5a4dc00f 100644
--- a/sbin/ifconfig/af_nd6.c
+++ b/sbin/ifconfig/af_nd6.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hiroki Sato. All rights reserved.
*
diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
index 23a119e3b9d7..5331a1fc969e 100644
--- a/sbin/ifconfig/carp.c
+++ b/sbin/ifconfig/carp.c
@@ -2,7 +2,7 @@
/* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
* Copyright (c) 2003 Ryan McBride. All rights reserved.
diff --git a/sbin/ifconfig/iffib.c b/sbin/ifconfig/iffib.c
index 7cb21ce54b09..1a622d7ddfce 100644
--- a/sbin/ifconfig/iffib.c
+++ b/sbin/ifconfig/iffib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Alexander V. Chernikov
* Copyright (c) 2011 Christian S.J. Peron
diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c
index b75dd4e0a7dd..7fcad2001000 100644
--- a/sbin/ifconfig/ifgif.c
+++ b/sbin/ifconfig/ifgif.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hiroki Sato. All rights reserved.
*
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
index d6fc0d5b53a2..677e484cfec3 100644
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Andrew Thompson. All rights reserved.
*
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index 7f1173c316d7..c26bc58cb57e 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Max Laier. All rights reserved.
*
diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
index e3b5e6a30bbc..cef463155fda 100644
--- a/sbin/ifconfig/ifpfsync.c
+++ b/sbin/ifconfig/ifpfsync.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryan McBride. All rights reserved.
* Copyright (c) 2004 Max Laier. All rights reserved.
diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c
index 962fe7064f8d..08be444318cc 100644
--- a/sbin/ipfw/nat64clat.c
+++ b/sbin/ipfw/nat64clat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Yandex LLC
* Copyright (c) 2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c
index ff36181815d9..755414f49959 100644
--- a/sbin/ipfw/nat64lsn.c
+++ b/sbin/ipfw/nat64lsn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2016 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c
index e82ec202b5c6..def9b9dd9b58 100644
--- a/sbin/ipfw/nat64stl.c
+++ b/sbin/ipfw/nat64stl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index a4c17ba20868..4fa5fabfaa36 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index 2fe44512f311..5da57df4771a 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index 8efbe6667b16..39db7421fee5 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index a623d0ca81e3..3864cb83fab9 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index dddb21bb562e..be986f682aa9 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index c4fbc46548e9..e4c9bcdc12b1 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index 339763404e78..5f8ba45dd11f 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index 3133e5367f25..07648690f1c7 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c
index 2dbd88b3ad3d..7f256c17f1c8 100644
--- a/sbin/kldconfig/kldconfig.c
+++ b/sbin/kldconfig/kldconfig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Peter Pentchev
* All rights reserved.
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index a8e43fdd1f92..8946d8ac281f 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index b8e4fd6e4b5d..2fee78238e9e 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index 637b9f623893..44a602d33f49 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index 81236feec5ca..ad464f463c1a 100644
--- a/sbin/ldconfig/elfhints.c
+++ b/sbin/ldconfig/elfhints.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 8aff4e6a5ef2..1196b3fb97b0 100644
--- a/sbin/ldconfig/ldconfig.h
+++ b/sbin/ldconfig/ldconfig.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 John D. Polstra
* All rights reserved.
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 0f76ca6149f1..f9f49092235e 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2004 Poul-Henning Kamp <phk@FreeBSD.org>
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index 2e6bb458def3..e42bea43575f 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Dima Dorfman.
* All rights reserved.
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 29c6e49412c3..cdd422b188ab 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 FreeBSD Inc.
* All rights reserved.
diff --git a/sbin/mount_fusefs/mount_fusefs.c b/sbin/mount_fusefs/mount_fusefs.c
index 9cb5de66d2dd..9b9b6d002d08 100644
--- a/sbin/mount_fusefs/mount_fusefs.c
+++ b/sbin/mount_fusefs/mount_fusefs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Jean-Sebastien Pedron
* Copyright (c) 2005 Csaba Henk
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index bac250e7dd05..635e9250a727 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index 76e11bae75c4..b31fef273d39 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, Nickolay Dudorov
* All rights reserved.
diff --git a/sbin/nvmecontrol/comnd.c b/sbin/nvmecontrol/comnd.c
index 0c53c54b9818..6f460670c442 100644
--- a/sbin/nvmecontrol/comnd.c
+++ b/sbin/nvmecontrol/comnd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Netflix, Inc
*
diff --git a/sbin/nvmecontrol/comnd.h b/sbin/nvmecontrol/comnd.h
index 91c97d4a873f..f84e80181ff5 100644
--- a/sbin/nvmecontrol/comnd.h
+++ b/sbin/nvmecontrol/comnd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Netflix, Inc
*
diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c
index 35dd1b47a811..dfca8a72eeda 100644
--- a/sbin/nvmecontrol/devlist.c
+++ b/sbin/nvmecontrol/devlist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c
index e6ebc9b70321..4fada6aa04e3 100644
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c
index a9ab80562032..c9a15b133381 100644
--- a/sbin/nvmecontrol/format.c
+++ b/sbin/nvmecontrol/format.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018-2019 Alexander Motin <mav@FreeBSD.org>
*
diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c
index 6cd7ad0fdc2d..4848814defe0 100644
--- a/sbin/nvmecontrol/identify.c
+++ b/sbin/nvmecontrol/identify.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c
index ff024b451767..6e69cc5f1351 100644
--- a/sbin/nvmecontrol/identify_ext.c
+++ b/sbin/nvmecontrol/identify_ext.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index f7a6ef311a40..8aa354752276 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
diff --git a/sbin/nvmecontrol/modules/intel/intel.c b/sbin/nvmecontrol/modules/intel/intel.c
index 8e3ed9e06cb9..4c5a57e2d9ff 100644
--- a/sbin/nvmecontrol/modules/intel/intel.c
+++ b/sbin/nvmecontrol/modules/intel/intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
diff --git a/sbin/nvmecontrol/nc_util.c b/sbin/nvmecontrol/nc_util.c
index e2ad59b2fd23..f5382cf311dc 100644
--- a/sbin/nvmecontrol/nc_util.c
+++ b/sbin/nvmecontrol/nc_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Netflix, Inc.
*
diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c
index 040918caf9c5..e713bb5bd8c8 100644
--- a/sbin/nvmecontrol/ns.c
+++ b/sbin/nvmecontrol/ns.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Netflix, Inc.
* Copyright (C) 2018-2019 Alexander Motin <mav@FreeBSD.org>
diff --git a/sbin/nvmecontrol/nsid.c b/sbin/nvmecontrol/nsid.c
index 34671901b49c..4b9cb568eaee 100644
--- a/sbin/nvmecontrol/nsid.c
+++ b/sbin/nvmecontrol/nsid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org>
*
diff --git a/sbin/nvmecontrol/nvmecontrol.c b/sbin/nvmecontrol/nvmecontrol.c
index 68a2ecb9b0b8..91e2d516f691 100644
--- a/sbin/nvmecontrol/nvmecontrol.c
+++ b/sbin/nvmecontrol/nvmecontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h
index c1daaf6730d3..25e42cb6bcf2 100644
--- a/sbin/nvmecontrol/nvmecontrol.h
+++ b/sbin/nvmecontrol/nvmecontrol.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/nvmecontrol_ext.h b/sbin/nvmecontrol/nvmecontrol_ext.h
index d60fcd4d8a2c..f0215effb671 100644
--- a/sbin/nvmecontrol/nvmecontrol_ext.h
+++ b/sbin/nvmecontrol/nvmecontrol_ext.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Netflix, Inc.
*
diff --git a/sbin/nvmecontrol/passthru.c b/sbin/nvmecontrol/passthru.c
index 0b24d7b1ea1f..d714e63e3e01 100644
--- a/sbin/nvmecontrol/passthru.c
+++ b/sbin/nvmecontrol/passthru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019-2021 Netflix, Inc
*
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index 0223bf3b5d51..a54301aecf39 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/reset.c b/sbin/nvmecontrol/reset.c
index f5ab7265c98b..8d5285c867c2 100644
--- a/sbin/nvmecontrol/reset.c
+++ b/sbin/nvmecontrol/reset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c
index adb3b64c9ec3..d3b0f0b3b83d 100644
--- a/sbin/nvmecontrol/resv.c
+++ b/sbin/nvmecontrol/resv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org>
*
diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c
index d5f649959d70..9680b3d138d9 100644
--- a/sbin/nvmecontrol/sanitize.c
+++ b/sbin/nvmecontrol/sanitize.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org>
*
diff --git a/sbin/nvmecontrol/selftest.c b/sbin/nvmecontrol/selftest.c
index 17945248f8e3..4dc2d4c0b517 100644
--- a/sbin/nvmecontrol/selftest.c
+++ b/sbin/nvmecontrol/selftest.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Chuck Tuffli
*
diff --git a/sbin/nvmecontrol/tests/basic.sh b/sbin/nvmecontrol/tests/basic.sh
index 4a3a8ed73c5c..42a576f4d634 100755
--- a/sbin/nvmecontrol/tests/basic.sh
+++ b/sbin/nvmecontrol/tests/basic.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 David A. Bright
#
diff --git a/sbin/pfilctl/pfilctl.c b/sbin/pfilctl/pfilctl.c
index e360c73cb279..284fd505002e 100644
--- a/sbin/pfilctl/pfilctl.c
+++ b/sbin/pfilctl/pfilctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Gleb Smirnoff <glebius@FreeBSD.org>
*
diff --git a/sbin/ping/main.c b/sbin/ping/main.c
index fce58e05bd2f..2f94b5d3227d 100644
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ping/main.h b/sbin/ping/main.h
index 51a368403bab..14cf7f75021f 100644
--- a/sbin/ping/main.h
+++ b/sbin/ping/main.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ping/ping.h b/sbin/ping/ping.h
index 36ce3c0b973d..40fcd500336a 100644
--- a/sbin/ping/ping.h
+++ b/sbin/ping/ping.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ping/ping6.h b/sbin/ping/ping6.h
index 5879b3684f2f..10ff6214f8ab 100644
--- a/sbin/ping/ping6.h
+++ b/sbin/ping/ping6.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ping/tests/in_cksum_test.c b/sbin/ping/tests/in_cksum_test.c
index 597f6ac20722..a0353adfc9a4 100644
--- a/sbin/ping/tests/in_cksum_test.c
+++ b/sbin/ping/tests/in_cksum_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh
index 9f821ed96360..7894d65a1c7a 100644
--- a/sbin/ping/tests/ping_test.sh
+++ b/sbin/ping/tests/ping_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
# All rights reserved.
diff --git a/sbin/ping/utils.h b/sbin/ping/utils.h
index cb56e587a368..4288e1069af2 100644
--- a/sbin/ping/utils.h
+++ b/sbin/ping/utils.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Jan Sucan <jansucan@FreeBSD.org>
* All rights reserved.
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index a8d4f4fdc3e1..1e3c60f8a1c8 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -3,7 +3,7 @@
#endif
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 1999 Matthew R. Green
* All rights reserved.
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
index 849d7a377714..42f91e905630 100644
--- a/sbin/reboot/nextboot.sh
+++ b/sbin/reboot/nextboot.sh
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2002 Gordon Tetlow. All rights reserved.
# Copyright (c) 2012 Sandvine Incorporated. All rights reserved.
diff --git a/sbin/route/tests/basic.sh b/sbin/route/tests/basic.sh
index 370a96a25892..a6a6679f1b70 100644
--- a/sbin/route/tests/basic.sh
+++ b/sbin/route/tests/basic.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Ahsan Barkati
#
diff --git a/sbin/route/tests/utils.subr b/sbin/route/tests/utils.subr
index fda9980eb78d..d53ba7d5534c 100644
--- a/sbin/route/tests/utils.subr
+++ b/sbin/route/tests/utils.subr
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Ahsan Barkati
#
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index e56310c635e9..c3c33f03fab2 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 2001 Joerg Wunsch
*
diff --git a/share/dtrace/ipfw.d b/share/dtrace/ipfw.d
index 3db51da04887..6cc1b249921c 100644
--- a/share/dtrace/ipfw.d
+++ b/share/dtrace/ipfw.d
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Yandex LLC
* Copyright (c) 2020 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 3ab16b58afb4..87dd8871888d 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2013 NetApp, Inc.
# All rights reserved.
diff --git a/share/examples/hast/ucarp.sh b/share/examples/hast/ucarp.sh
index 988c6b73c2c2..352687d1ebe8 100755
--- a/share/examples/hast/ucarp.sh
+++ b/share/examples/hast/ucarp.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2010 The FreeBSD Foundation
# All rights reserved.
diff --git a/share/examples/hast/ucarp_down.sh b/share/examples/hast/ucarp_down.sh
index f18df05d4d69..295b9084f0eb 100755
--- a/share/examples/hast/ucarp_down.sh
+++ b/share/examples/hast/ucarp_down.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2010 The FreeBSD Foundation
# All rights reserved.
diff --git a/share/examples/hast/ucarp_up.sh b/share/examples/hast/ucarp_up.sh
index e8b147405625..c61a1bfbc8a8 100755
--- a/share/examples/hast/ucarp_up.sh
+++ b/share/examples/hast/ucarp_up.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2010 The FreeBSD Foundation
# All rights reserved.
diff --git a/share/examples/ipfw/change_rules.sh b/share/examples/ipfw/change_rules.sh
index c33ce2680c4f..b088d75f82d4 100755
--- a/share/examples/ipfw/change_rules.sh
+++ b/share/examples/ipfw/change_rules.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2000 Alexandre Peixoto
# All rights reserved.
diff --git a/share/examples/kld/khelp/h_example.c b/share/examples/kld/khelp/h_example.c
index 6eb394a9e67e..16f4351a4d22 100644
--- a/share/examples/kld/khelp/h_example.c
+++ b/share/examples/kld/khelp/h_example.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 The FreeBSD Foundation
* All rights reserved.
diff --git a/share/examples/kld/random_adaptor/random_adaptor_example.c b/share/examples/kld/random_adaptor/random_adaptor_example.c
index 72017bef2c40..7907179d3078 100644
--- a/share/examples/kld/random_adaptor/random_adaptor_example.c
+++ b/share/examples/kld/random_adaptor/random_adaptor_example.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Arthur Mesh <arthurmesh@gmail.com>
* All rights reserved.
diff --git a/share/examples/kld/syscall/module/syscall.c b/share/examples/kld/syscall/module/syscall.c
index 701e2492884c..7dbbf082858a 100644
--- a/share/examples/kld/syscall/module/syscall.c
+++ b/share/examples/kld/syscall/module/syscall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c
index 25e27082bf02..1fb509d1f0ab 100644
--- a/share/examples/kld/syscall/test/call.c
+++ b/share/examples/kld/syscall/test/call.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 5da1c8bb2eff..cfc697a6073b 100644
--- a/share/examples/libvgl/demo.c
+++ b/share/examples/libvgl/demo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
diff --git a/share/examples/mdoc/POSIX-copyright b/share/examples/mdoc/POSIX-copyright
index 8510ce4ff97f..13609ea8c82e 100644
--- a/share/examples/mdoc/POSIX-copyright
+++ b/share/examples/mdoc/POSIX-copyright
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) [year] [your name]
.\"
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index c574b7f0f849..0bdabe95aa95 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) [year] [your name]
.\"
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index 52efbf9ca45b..c4e85062cad1 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) [year] [your name]
.\"
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index 1d93ae90f26c..47ae5456b79a 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) [year] [your name]
.\"
diff --git a/share/examples/mdoc/example.9 b/share/examples/mdoc/example.9
index 7e61a64cdc2e..1dd24a99fd42 100644
--- a/share/examples/mdoc/example.9
+++ b/share/examples/mdoc/example.9
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) [year] [your name]
.\"
diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c
index e871c3743362..9fadefba94b7 100644
--- a/share/examples/scsi_target/scsi_cmds.c
+++ b/share/examples/scsi_target/scsi_cmds.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* SCSI Disk Emulator
*
diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c
index f7484fda4618..663e3d369571 100644
--- a/share/examples/scsi_target/scsi_target.c
+++ b/share/examples/scsi_target/scsi_target.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* SCSI Disk Emulator
*
diff --git a/share/examples/scsi_target/scsi_target.h b/share/examples/scsi_target/scsi_target.h
index 09822bed68e5..56e93ba37418 100644
--- a/share/examples/scsi_target/scsi_target.h
+++ b/share/examples/scsi_target/scsi_target.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* SCSI Target Emulator
*
diff --git a/share/examples/sound/basic.c b/share/examples/sound/basic.c
index c903cbd8bf11..83ecbe6ea9a7 100644
--- a/share/examples/sound/basic.c
+++ b/share/examples/sound/basic.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Goran Mekić
*
diff --git a/share/examples/sound/midi.c b/share/examples/sound/midi.c
index fbe4d9480530..7149bcb31c82 100644
--- a/share/examples/sound/midi.c
+++ b/share/examples/sound/midi.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Goran Mekić
*
diff --git a/share/examples/sound/ossinit.h b/share/examples/sound/ossinit.h
index b5fbd3e99244..5fd614ecb4fb 100644
--- a/share/examples/sound/ossinit.h
+++ b/share/examples/sound/ossinit.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Goran Mekić
*
diff --git a/share/examples/sound/ossmidi.h b/share/examples/sound/ossmidi.h
index 507508061de4..60bf5e41173e 100644
--- a/share/examples/sound/ossmidi.h
+++ b/share/examples/sound/ossmidi.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Goran Mekić
*
diff --git a/share/man/man3lua/intro.3lua b/share/man/man3lua/intro.3lua
index 854865a5ca42..3895def31e56 100644
--- a/share/man/man3lua/intro.3lua
+++ b/share/man/man3lua/intro.3lua
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020, Ryan Moeller <freqlabs@FreeBSD.org>
.\"
diff --git a/share/man/man4/cp2112.4 b/share/man/man4/cp2112.4
index 39ac8dba114e..df12acb386d1 100644
--- a/share/man/man4/cp2112.4
+++ b/share/man/man4/cp2112.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/efidev.4 b/share/man/man4/efidev.4
index b32a44325f92..1157c79fea7b 100644
--- a/share/man/man4/efidev.4
+++ b/share/man/man4/efidev.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/share/man/man4/ftwd.4 b/share/man/man4/ftwd.4
index 6acef6698ac1..d60a2a24cff6 100644
--- a/share/man/man4/ftwd.4
+++ b/share/man/man4/ftwd.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2012 Bjoern A. Zeeb <bz@FreeBSD.org>
.\" Copyright (c) 2019 Andriy Gapon <avg@FreeBSD.org>
diff --git a/share/man/man4/gpiokeys.4 b/share/man/man4/gpiokeys.4
index 5af11cedb7e0..de6e315ed3ce 100644
--- a/share/man/man4/gpiokeys.4
+++ b/share/man/man4/gpiokeys.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/htu21.4 b/share/man/man4/htu21.4
index 17fbfb64b3a0..252c28de6f6c 100644
--- a/share/man/man4/htu21.4
+++ b/share/man/man4/htu21.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2021 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/imcsmb.4 b/share/man/man4/imcsmb.4
index b1acb8bca00d..65947c1bdf8e 100644
--- a/share/man/man4/imcsmb.4
+++ b/share/man/man4/imcsmb.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Panasas
.\"
diff --git a/share/man/man4/itwd.4 b/share/man/man4/itwd.4
index b050e9a43e74..7c8af56b53ca 100644
--- a/share/man/man4/itwd.4
+++ b/share/man/man4/itwd.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2012 Bjoern A. Zeeb <bz@FreeBSD.org>
.\" Copyright (c) 2019 Andriy Gapon <avg@FreeBSD.org>
diff --git a/share/man/man4/jedec_dimm.4 b/share/man/man4/jedec_dimm.4
index 6c13da1a450e..44dd790e5391 100644
--- a/share/man/man4/jedec_dimm.4
+++ b/share/man/man4/jedec_dimm.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2016 Andriy Gapon <avg@FreeBSD.org>
.\" Copyright (c) 2018 Ravi Pokala <rpokala@freebsd.org>
diff --git a/share/man/man4/man4.aarch64/rk_i2c.4 b/share/man/man4/man4.aarch64/rk_i2c.4
index 277c875aff7e..4e6eea739cc2 100644
--- a/share/man/man4/man4.aarch64/rk_i2c.4
+++ b/share/man/man4/man4.aarch64/rk_i2c.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
.\"
diff --git a/share/man/man4/man4.arm/aw_sid.4 b/share/man/man4/man4.arm/aw_sid.4
index a6e21207f0da..87467f98b2cb 100644
--- a/share/man/man4/man4.arm/aw_sid.4
+++ b/share/man/man4/man4.arm/aw_sid.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/share/man/man4/man4.arm/aw_syscon.4 b/share/man/man4/man4.arm/aw_syscon.4
index 8430e63b8f14..ca19abb1b944 100644
--- a/share/man/man4/man4.arm/aw_syscon.4
+++ b/share/man/man4/man4.arm/aw_syscon.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/share/man/man4/man4.arm/bcm283x_pwm.4 b/share/man/man4/man4.arm/bcm283x_pwm.4
index 2b1266a7046a..8c679fa9d68a 100644
--- a/share/man/man4/man4.arm/bcm283x_pwm.4
+++ b/share/man/man4/man4.arm/bcm283x_pwm.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2017 Poul-Henning Kamp <phk@FreeBSD.org>
.\" All rights reserved.
diff --git a/share/man/man4/max44009.4 b/share/man/man4/max44009.4
index fa399c52cec3..507b64177251 100644
--- a/share/man/man4/max44009.4
+++ b/share/man/man4/max44009.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/ng_vlan_rotate.4 b/share/man/man4/ng_vlan_rotate.4
index 4640737c7d54..040b99191293 100644
--- a/share/man/man4/ng_vlan_rotate.4
+++ b/share/man/man4/ng_vlan_rotate.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2019-2021 IKS Service GmbH
.\"
diff --git a/share/man/man4/pca954x.4 b/share/man/man4/pca954x.4
index d845740f9b6c..0b6b3fa8cf13 100644
--- a/share/man/man4/pca954x.4
+++ b/share/man/man4/pca954x.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/pcf8574.4 b/share/man/man4/pcf8574.4
index 9fdf71874063..15b96a396aab 100644
--- a/share/man/man4/pcf8574.4
+++ b/share/man/man4/pcf8574.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/pcf8591.4 b/share/man/man4/pcf8591.4
index 2876ad057f90..6133d6cfa0d8 100644
--- a/share/man/man4/pcf8591.4
+++ b/share/man/man4/pcf8591.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/sume.4 b/share/man/man4/sume.4
index 66c221cc2d08..7da656595241 100644
--- a/share/man/man4/sume.4
+++ b/share/man/man4/sume.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Denis Salopek
.\"
diff --git a/share/man/man4/superio.4 b/share/man/man4/superio.4
index e242875e3b09..a701c138fe42 100644
--- a/share/man/man4/superio.4
+++ b/share/man/man4/superio.4
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2019 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man4/tslog.4 b/share/man/man4/tslog.4
index 5b0f5fbb1264..93fb66f9e857 100644
--- a/share/man/man4/tslog.4
+++ b/share/man/man4/tslog.4
@@ -1,4 +1,4 @@
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2022 Mateusz Piotrowski <0mp@FreeBSD.org>
.\"
diff --git a/share/man/man4/vmd.4 b/share/man/man4/vmd.4
index 6c49e2b83ec0..af2980820df5 100644
--- a/share/man/man4/vmd.4
+++ b/share/man/man4/vmd.4
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2021 Alexander Motin <mav@FreeBSD.org>
.\" Copyright 2019 Cisco Systems, Inc.
diff --git a/share/man/man5/fusefs.5 b/share/man/man5/fusefs.5
index 24858b2ac4e7..0a5b9f5399d7 100644
--- a/share/man/man5/fusefs.5
+++ b/share/man/man5/fusefs.5
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2019 The FreeBSD Foundation
.\"
diff --git a/share/man/man5/lindebugfs.5 b/share/man/man5/lindebugfs.5
index 0d93d6aec6b9..8e385be7d743 100644
--- a/share/man/man5/lindebugfs.5
+++ b/share/man/man5/lindebugfs.5
@@ -1,4 +1,4 @@
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2022, Jake Freeland <jfree@freebsd.org>
.\"
diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5
index 81f10b9df845..14517e95ce76 100644
--- a/share/man/man5/style.mdoc.5
+++ b/share/man/man5/style.mdoc.5
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018-2022 Mateusz Piotrowski <0mp@FreeBSD.org>
.\"
diff --git a/share/man/man7/stats.7 b/share/man/man7/stats.7
index 8be124392d19..d33f15ba0f2d 100644
--- a/share/man/man7/stats.7
+++ b/share/man/man7/stats.7
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2020 Daniel Ebdrup Jensen
.\"
diff --git a/share/man/man8/beinstall.8 b/share/man/man8/beinstall.8
index dc43f53a119b..c8fde9b21c29 100644
--- a/share/man/man8/beinstall.8
+++ b/share/man/man8/beinstall.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Mateusz Piotrowski <0mp@FreeBSD.org>
.\"
diff --git a/share/man/man9/BUS_GET_PROPERTY.9 b/share/man/man9/BUS_GET_PROPERTY.9
index 6d6bc14b4d8f..5dac0ea34127 100644
--- a/share/man/man9/BUS_GET_PROPERTY.9
+++ b/share/man/man9/BUS_GET_PROPERTY.9
@@ -1,5 +1,5 @@
.\" -
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2021 Semihalf
.\"
diff --git a/share/man/man9/VOP_BMAP.9 b/share/man/man9/VOP_BMAP.9
index 02869838274b..66c6d5a6537a 100644
--- a/share/man/man9/VOP_BMAP.9
+++ b/share/man/man9/VOP_BMAP.9
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2019 The FreeBSD Foundation
.\"
diff --git a/share/man/man9/device_get_property.9 b/share/man/man9/device_get_property.9
index 93c01f199477..939b576f680f 100644
--- a/share/man/man9/device_get_property.9
+++ b/share/man/man9/device_get_property.9
@@ -1,5 +1,5 @@
.\" -
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2021 Semihalf
.\"
diff --git a/share/man/man9/efirt.9 b/share/man/man9/efirt.9
index cdf0ea21ad8d..41dabc1114f9 100644
--- a/share/man/man9/efirt.9
+++ b/share/man/man9/efirt.9
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/share/man/man9/ether_gen_addr.9 b/share/man/man9/ether_gen_addr.9
index f69cb199e2c3..963d74e94162 100644
--- a/share/man/man9/ether_gen_addr.9
+++ b/share/man/man9/ether_gen_addr.9
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (C) 2021 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 16782fe22197..da15a8a8b266 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -64,7 +64,7 @@ The copyright header should be a multi-line comment, with the first
line of the comment having a dash after the star like so:
.Bd -literal
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1984-2025 John Q. Public
*
diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9
index 089b4e986dca..ee773e4d2664 100644
--- a/share/man/man9/style.lua.9
+++ b/share/man/man9/style.lua.9
@@ -1,5 +1,5 @@
.\"-
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/share/man/man9/superio.9 b/share/man/man9/superio.9
index 832871d6980a..898999675948 100644
--- a/share/man/man9/superio.9
+++ b/share/man/man9/superio.9
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2019 Andriy Gapon <avg@FreeBSD.org>
.\"
diff --git a/share/man/man9/vnode_pager_setsize.9 b/share/man/man9/vnode_pager_setsize.9
index 0dc3b2057930..8de33541f8a1 100644
--- a/share/man/man9/vnode_pager_setsize.9
+++ b/share/man/man9/vnode_pager_setsize.9
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2021 The FreeBSD Foundation
.\"
diff --git a/share/mk/version_gen.awk b/share/mk/version_gen.awk
index b9747cefd56e..3e374719f5c5 100644
--- a/share/mk/version_gen.awk
+++ b/share/mk/version_gen.awk
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (C) 2006 Daniel M. Eischen. All rights reserved.
#
diff --git a/share/syscons/scrnmaps/mkscrfil.c b/share/syscons/scrnmaps/mkscrfil.c
index 82e5c0787996..4c9198ad6f8e 100644
--- a/share/syscons/scrnmaps/mkscrfil.c
+++ b/share/syscons/scrnmaps/mkscrfil.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1994 by Andrew A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/stand/efi/libefi/efihttp.c b/stand/efi/libefi/efihttp.c
index 728f95a47b42..b71ebd4274f0 100644
--- a/stand/efi/libefi/efihttp.c
+++ b/stand/efi/libefi/efihttp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Intel Corporation
*
diff --git a/stand/efi/loader/arch/riscv/start.S b/stand/efi/loader/arch/riscv/start.S
index e63ce68d86ba..50bac6553ea1 100644
--- a/stand/efi/loader/arch/riscv/start.S
+++ b/stand/efi/loader/arch/riscv/start.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Mitchell Horne <mhorne@FreeBSD.org>
*
diff --git a/stand/libsa/closeall.c b/stand/libsa/closeall.c
index 92c6955cf5da..1624788f8548 100644
--- a/stand/libsa/closeall.c
+++ b/stand/libsa/closeall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Toomas Soome <tsoome@me.com>
*
diff --git a/stand/libsa/geli/geli_metadata.c b/stand/libsa/geli/geli_metadata.c
index ba46058f688f..d19bb5d0bdf0 100644
--- a/stand/libsa/geli/geli_metadata.c
+++ b/stand/libsa/geli/geli_metadata.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Ian Lepore <ian@FreeBSD.org>
*
diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c
index 3e256c290739..6f248f4e66d7 100644
--- a/stand/libsa/geli/gelidev.c
+++ b/stand/libsa/geli/gelidev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Ian Lepore <ian@FreeBSD.org>
*
diff --git a/stand/lua/cli.lua b/stand/lua/cli.lua
index 12f6b57642db..11f3b41a7fed 100644
--- a/stand/lua/cli.lua
+++ b/stand/lua/cli.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/cli.lua.8 b/stand/lua/cli.lua.8
index 2d6df3fd4e6b..e5cbfa8b0796 100644
--- a/stand/lua/cli.lua.8
+++ b/stand/lua/cli.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/color.lua b/stand/lua/color.lua
index 4dc16cacb97e..72024e241d10 100644
--- a/stand/lua/color.lua
+++ b/stand/lua/color.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- All rights reserved.
diff --git a/stand/lua/color.lua.8 b/stand/lua/color.lua.8
index d32f702c0daa..6fac24778589 100644
--- a/stand/lua/color.lua.8
+++ b/stand/lua/color.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/config.lua b/stand/lua/config.lua
index 9ef7c0796f46..3adad0016bf8 100644
--- a/stand/lua/config.lua
+++ b/stand/lua/config.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8
index 4fc51c90045f..6376edeb2615 100644
--- a/stand/lua/config.lua.8
+++ b/stand/lua/config.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/core.lua b/stand/lua/core.lua
index 27e3c14de9ff..83a522febffe 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/stand/lua/core.lua.8 b/stand/lua/core.lua.8
index eb9ac5336d8e..19d97bb2d74b 100644
--- a/stand/lua/core.lua.8
+++ b/stand/lua/core.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua
index 6f6e2fe1b3e8..24f2f0ddb3b3 100644
--- a/stand/lua/drawer.lua
+++ b/stand/lua/drawer.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/stand/lua/drawer.lua.8 b/stand/lua/drawer.lua.8
index 4a76895bdddb..6ee0bac2412a 100644
--- a/stand/lua/drawer.lua.8
+++ b/stand/lua/drawer.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/gfx-beastie.lua b/stand/lua/gfx-beastie.lua
index f88f8c8dd306..c806cdb86fa1 100644
--- a/stand/lua/gfx-beastie.lua
+++ b/stand/lua/gfx-beastie.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/gfx-beastiebw.lua b/stand/lua/gfx-beastiebw.lua
index 5895b2436542..ffda4c114447 100644
--- a/stand/lua/gfx-beastiebw.lua
+++ b/stand/lua/gfx-beastiebw.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/gfx-fbsdbw.lua b/stand/lua/gfx-fbsdbw.lua
index c219934b4ad6..7062a0a61e0d 100644
--- a/stand/lua/gfx-fbsdbw.lua
+++ b/stand/lua/gfx-fbsdbw.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/gfx-orb.lua b/stand/lua/gfx-orb.lua
index 2702618948d6..c313fc1617b7 100644
--- a/stand/lua/gfx-orb.lua
+++ b/stand/lua/gfx-orb.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/gfx-orbbw.lua b/stand/lua/gfx-orbbw.lua
index 7cc8b1919b03..641c7eef268a 100644
--- a/stand/lua/gfx-orbbw.lua
+++ b/stand/lua/gfx-orbbw.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/hook.lua b/stand/lua/hook.lua
index 9c7e4deeb7e4..848e47567797 100644
--- a/stand/lua/hook.lua
+++ b/stand/lua/hook.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/stand/lua/hook.lua.8 b/stand/lua/hook.lua.8
index 1bc9ca96b509..016ac5aae8d3 100644
--- a/stand/lua/hook.lua.8
+++ b/stand/lua/hook.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua
index 0008cae93641..8910af4673f9 100644
--- a/stand/lua/loader.lua
+++ b/stand/lua/loader.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua
index 4a326cb54bb9..5fa8c23f0e67 100644
--- a/stand/lua/menu.lua
+++ b/stand/lua/menu.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/stand/lua/menu.lua.8 b/stand/lua/menu.lua.8
index 38655414258f..6350ab6d470c 100644
--- a/stand/lua/menu.lua.8
+++ b/stand/lua/menu.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/password.lua b/stand/lua/password.lua
index 3aea8e80bae6..a47a617944d7 100644
--- a/stand/lua/password.lua
+++ b/stand/lua/password.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
diff --git a/stand/lua/password.lua.8 b/stand/lua/password.lua.8
index db235aadec8d..4e4087646a02 100644
--- a/stand/lua/password.lua.8
+++ b/stand/lua/password.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua
index baa58fb23dca..34c78ca28725 100644
--- a/stand/lua/screen.lua
+++ b/stand/lua/screen.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2015 Pedro Souza <pedrosouza@freebsd.org>
-- All rights reserved.
diff --git a/stand/lua/screen.lua.8 b/stand/lua/screen.lua.8
index d272f3ca8028..0d1728f6d385 100644
--- a/stand/lua/screen.lua.8
+++ b/stand/lua/screen.lua.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
.\"
diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8
index b15ae53f2f9d..ab566edc36c5 100644
--- a/stand/man/loader.efi.8
+++ b/stand/man/loader.efi.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright (c) 2019-2022 Netflix, Inc
.\" Copyright (c) 2022 Mateusz Piotrowski <0mp@FreeBSD.org>
diff --git a/stand/powerpc/ofw/trampolineLE.S b/stand/powerpc/ofw/trampolineLE.S
index cd940fb3dfee..9290d5d2a00f 100644
--- a/stand/powerpc/ofw/trampolineLE.S
+++ b/stand/powerpc/ofw/trampolineLE.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Brandon Bergren <bdragon@FreeBSD.org>
*
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 7d8b303f6f16..c5ac06a96be5 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index 62e11f5797f6..e86a20758c07 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
* Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index d502431b1e28..52efb0ffd0ec 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
diff --git a/sys/amd64/amd64/copyout.c b/sys/amd64/amd64/copyout.c
index d5f94dd39276..2f4e06b12b69 100644
--- a/sys/amd64/amd64/copyout.c
+++ b/sys/amd64/amd64/copyout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/amd64/amd64/efirt_support.S b/sys/amd64/amd64/efirt_support.S
index 7546a0765204..f9cc9247c86f 100644
--- a/sys/amd64/amd64/efirt_support.S
+++ b/sys/amd64/amd64/efirt_support.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index d58a32f587d4..8a68c31f53d4 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c
index 02b76a35d7ae..805fb3fd471e 100644
--- a/sys/amd64/amd64/gdb_machdep.c
+++ b/sys/amd64/amd64/gdb_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index 8d4c9d9cbe64..a17ef89ba9f8 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) KATO Takenori, 1997, 1998.
*
diff --git a/sys/amd64/amd64/io.c b/sys/amd64/amd64/io.c
index 5d70ba612859..28f87663ca54 100644
--- a/sys/amd64/amd64/io.c
+++ b/sys/amd64/amd64/io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 3b9c39ad58da..c37174f2de33 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 650f83b1aad4..f48ce89548de 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, by Steve Passe
* Copyright (c) 2003, by Peter Wemm
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index 72b18faef028..1f283500332a 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 Bruce D. Evans.
* All rights reserved.
diff --git a/sys/amd64/amd64/ptrace_machdep.c b/sys/amd64/amd64/ptrace_machdep.c
index 069a5b4cdb9d..764e89307bd6 100644
--- a/sys/amd64/amd64/ptrace_machdep.c
+++ b/sys/amd64/amd64/ptrace_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/amd64/amd64/uma_machdep.c b/sys/amd64/amd64/uma_machdep.c
index 479cb4e37d9e..f4dee7084bd3 100644
--- a/sys/amd64/amd64/uma_machdep.c
+++ b/sys/amd64/amd64/uma_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/amd64/ia32/ia32_misc.c b/sys/amd64/ia32/ia32_misc.c
index 6307ede32047..710da3156fb9 100644
--- a/sys/amd64/ia32/ia32_misc.c
+++ b/sys/amd64/ia32/ia32_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Konstantin Belousov
* All rights reserved.
diff --git a/sys/amd64/ia32/ia32_reg.c b/sys/amd64/ia32/ia32_reg.c
index 539a268ef350..c7359e6d5d3a 100644
--- a/sys/amd64/ia32/ia32_reg.c
+++ b/sys/amd64/ia32/ia32_reg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
diff --git a/sys/amd64/include/_bus.h b/sys/amd64/include/_bus.h
index a437489bf1da..0f5df53e9c49 100644
--- a/sys/amd64/include/_bus.h
+++ b/sys/amd64/include/_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/amd64/include/asan.h b/sys/amd64/include/asan.h
index 03d57673d05e..4a9448c874b1 100644
--- a/sys/amd64/include/asan.h
+++ b/sys/amd64/include/asan.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 The FreeBSD Foundation
*
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index d61fb359e261..a9ee6f1a4fac 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 26d71888d328..e418290ba469 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Scott Long
* All rights reserved.
diff --git a/sys/amd64/include/counter.h b/sys/amd64/include/counter.h
index e7eb19e058cd..af78bc1db9fe 100644
--- a/sys/amd64/include/counter.h
+++ b/sys/amd64/include/counter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index 5eb96d03b981..eb9ead6183bf 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/amd64/include/gdb_machdep.h b/sys/amd64/include/gdb_machdep.h
index 4379b8a74709..acaf3c9bb3a8 100644
--- a/sys/amd64/include/gdb_machdep.h
+++ b/sys/amd64/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h
index 48af1fd1d578..ea8911b528c3 100644
--- a/sys/amd64/include/intr_machdep.h
+++ b/sys/amd64/include/intr_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/amd64/include/iodev.h b/sys/amd64/include/iodev.h
index 5aced158609e..253e4dc15ce4 100644
--- a/sys/amd64/include/iodev.h
+++ b/sys/amd64/include/iodev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/amd64/include/kdb.h b/sys/amd64/include/kdb.h
index 03cb2205066f..e2a16ccca0eb 100644
--- a/sys/amd64/include/kdb.h
+++ b/sys/amd64/include/kdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/amd64/include/memdev.h b/sys/amd64/include/memdev.h
index 1e37449aaa9d..e1db4bc9192d 100644
--- a/sys/amd64/include/memdev.h
+++ b/sys/amd64/include/memdev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/amd64/include/minidump.h b/sys/amd64/include/minidump.h
index f3d10df49983..cfec30c76bfb 100644
--- a/sys/amd64/include/minidump.h
+++ b/sys/amd64/include/minidump.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/amd64/include/mp_watchdog.h b/sys/amd64/include/mp_watchdog.h
index e1fc0742ee1e..46eb9c709e49 100644
--- a/sys/amd64/include/mp_watchdog.h
+++ b/sys/amd64/include/mp_watchdog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 4b2d9af02558..0c5b4331e3b6 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index 13de60f650de..21cef4ed858b 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Peter Wemm <peter@netplex.com.au>
* All rights reserved.
diff --git a/sys/amd64/include/pcpu_aux.h b/sys/amd64/include/pcpu_aux.h
index 50dfa30fbf5b..99f637f4473d 100644
--- a/sys/amd64/include/pcpu_aux.h
+++ b/sys/amd64/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h
index 5563f5b1bdbb..0b774bbde83c 100644
--- a/sys/amd64/include/pmc_mdep.h
+++ b/sys/amd64/include/pmc_mdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/amd64/include/ppireg.h b/sys/amd64/include/ppireg.h
index 9794504da499..f3695e37cf31 100644
--- a/sys/amd64/include/ppireg.h
+++ b/sys/amd64/include/ppireg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
diff --git a/sys/amd64/include/runq.h b/sys/amd64/include/runq.h
index c3e26ff57432..268aa7a463d7 100644
--- a/sys/amd64/include/runq.h
+++ b/sys/amd64/include/runq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/amd64/include/sf_buf.h b/sys/amd64/include/sf_buf.h
index 216dfe8d411b..205c1e25d14d 100644
--- a/sys/amd64/include/sf_buf.h
+++ b/sys/amd64/include/sf_buf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2005 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/amd64/include/timerreg.h b/sys/amd64/include/timerreg.h
index 77e6cad5775d..4804ce98c6d8 100644
--- a/sys/amd64/include/timerreg.h
+++ b/sys/amd64/include/timerreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
diff --git a/sys/amd64/include/vm.h b/sys/amd64/include/vm.h
index fef7a53ca317..7d4f3e2cccdf 100644
--- a/sys/amd64/include/vm.h
+++ b/sys/amd64/include/vm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h
index 95f5597f7e1a..29797ad04e0d 100644
--- a/sys/amd64/include/vmm.h
+++ b/sys/amd64/include/vmm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h
index deeb125428f3..def48a9f86fe 100644
--- a/sys/amd64/include/vmm_dev.h
+++ b/sys/amd64/include/vmm_dev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/include/vmm_instruction_emul.h b/sys/amd64/include/vmm_instruction_emul.h
index 082405971fe4..ba7b77efda32 100644
--- a/sys/amd64/include/vmm_instruction_emul.h
+++ b/sys/amd64/include/vmm_instruction_emul.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/include/vmm_snapshot.h b/sys/amd64/include/vmm_snapshot.h
index c4d7fc4d4371..d18480e4294d 100644
--- a/sys/amd64/include/vmm_snapshot.h
+++ b/sys/amd64/include/vmm_snapshot.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Flavius Anton
* Copyright (c) 2016 Mihai Tiganus
diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h
index a2fb6c94466e..80e0b157b461 100644
--- a/sys/amd64/linux/linux.h
+++ b/sys/amd64/linux/linux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
diff --git a/sys/amd64/linux/linux_dummy_machdep.c b/sys/amd64/linux/linux_dummy_machdep.c
index ed148a5a6500..fd5d594b8215 100644
--- a/sys/amd64/linux/linux_dummy_machdep.c
+++ b/sys/amd64/linux/linux_dummy_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/amd64/linux/linux_locore.asm b/sys/amd64/linux/linux_locore.asm
index 2d7dff839b6f..5918fed2cad8 100644
--- a/sys/amd64/linux/linux_locore.asm
+++ b/sys/amd64/linux/linux_locore.asm
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2022 Dmitry Chagin <dchagin@freeBSD.org>
*
diff --git a/sys/amd64/linux/linux_support.s b/sys/amd64/linux/linux_support.s
index 1e9ad45b9623..6bc23e5d4ca6 100644
--- a/sys/amd64/linux/linux_support.s
+++ b/sys/amd64/linux/linux_support.s
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Konstantin Belousov
* All rights reserved.
diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c
index 95e0ae145fa6..d994d9aa6fba 100644
--- a/sys/amd64/linux/linux_vdso_gtod.c
+++ b/sys/amd64/linux/linux_vdso_gtod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/amd64/linux32/linux32_dummy_machdep.c b/sys/amd64/linux32/linux32_dummy_machdep.c
index 4dc0f6ffc0bd..39c842989846 100644
--- a/sys/amd64/linux32/linux32_dummy_machdep.c
+++ b/sys/amd64/linux32/linux32_dummy_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.s
index c92cb48e2d1a..0e3fa2ccc42d 100644
--- a/sys/amd64/linux32/linux32_support.s
+++ b/sys/amd64/linux32/linux32_support.s
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Konstantin Belousov
* All rights reserved.
diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c
index 075b6f3af7f4..f24bfaa37217 100644
--- a/sys/amd64/linux32/linux32_vdso_gtod.c
+++ b/sys/amd64/linux32/linux32_vdso_gtod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 7e6eee79ba7a..6e5d6d4eab8c 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
diff --git a/sys/amd64/vmm/amd/amdiommu.c b/sys/amd64/vmm/amd/amdiommu.c
index 8dceb1aa241b..47bf29af36be 100644
--- a/sys/amd64/vmm/amd/amdiommu.c
+++ b/sys/amd64/vmm/amd/amdiommu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/amd64/vmm/amd/amdv.c b/sys/amd64/vmm/amd/amdv.c
index 89a50ed7c0a9..7765db2bf326 100644
--- a/sys/amd64/vmm/amd/amdv.c
+++ b/sys/amd64/vmm/amd/amdv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/amdvi_hw.c b/sys/amd64/vmm/amd/amdvi_hw.c
index 87270b24c9f6..9662763b6027 100644
--- a/sys/amd64/vmm/amd/amdvi_hw.c
+++ b/sys/amd64/vmm/amd/amdvi_hw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016, Anish Gupta (anish@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/amdvi_priv.h b/sys/amd64/vmm/amd/amdvi_priv.h
index 6960ef24d683..5f0732d5e98d 100644
--- a/sys/amd64/vmm/amd/amdvi_priv.h
+++ b/sys/amd64/vmm/amd/amdvi_priv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Anish Gupta (anish@freebsd.org)
* Copyright (c) 2021 The FreeBSD Foundation
diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c
index a0b332e297b1..1cde25abd7d2 100644
--- a/sys/amd64/vmm/amd/ivrs_drv.c
+++ b/sys/amd64/vmm/amd/ivrs_drv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016, Anish Gupta (anish@freebsd.org)
* Copyright (c) 2021 The FreeBSD Foundation
diff --git a/sys/amd64/vmm/amd/npt.c b/sys/amd64/vmm/amd/npt.c
index 01d5bc7b28fd..c5f6c7743569 100644
--- a/sys/amd64/vmm/amd/npt.c
+++ b/sys/amd64/vmm/amd/npt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/npt.h b/sys/amd64/vmm/amd/npt.h
index 35530d783397..666ca7be42eb 100644
--- a/sys/amd64/vmm/amd/npt.h
+++ b/sys/amd64/vmm/amd/npt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
index bd0c4db20b3d..ab2fa2310c14 100644
--- a/sys/amd64/vmm/amd/svm.c
+++ b/sys/amd64/vmm/amd/svm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm.h b/sys/amd64/vmm/amd/svm.h
index 6ad25b3cb7ce..d9058f1a963c 100644
--- a/sys/amd64/vmm/amd/svm.h
+++ b/sys/amd64/vmm/amd/svm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm_genassym.c b/sys/amd64/vmm/amd/svm_genassym.c
index 3fd04e451753..78c65beb8033 100644
--- a/sys/amd64/vmm/amd/svm_genassym.c
+++ b/sys/amd64/vmm/amd/svm_genassym.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm_msr.c b/sys/amd64/vmm/amd/svm_msr.c
index 82d4087c32ef..899af5ff36b2 100644
--- a/sys/amd64/vmm/amd/svm_msr.c
+++ b/sys/amd64/vmm/amd/svm_msr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014, Neel Natu (neel@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm_msr.h b/sys/amd64/vmm/amd/svm_msr.h
index 7b3cab6e31a3..d6792e2997b6 100644
--- a/sys/amd64/vmm/amd/svm_msr.h
+++ b/sys/amd64/vmm/amd/svm_msr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Neel Natu (neel@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm_softc.h b/sys/amd64/vmm/amd/svm_softc.h
index 5cc2da5343a0..d47a7c4da658 100644
--- a/sys/amd64/vmm/amd/svm_softc.h
+++ b/sys/amd64/vmm/amd/svm_softc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/svm_support.S b/sys/amd64/vmm/amd/svm_support.S
index bf9e9a0f89cc..59b2b0545a37 100644
--- a/sys/amd64/vmm/amd/svm_support.S
+++ b/sys/amd64/vmm/amd/svm_support.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/vmcb.c b/sys/amd64/vmm/amd/vmcb.c
index bd7f2647a45d..ac3ecc49fde0 100644
--- a/sys/amd64/vmm/amd/vmcb.c
+++ b/sys/amd64/vmm/amd/vmcb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/amd/vmcb.h b/sys/amd64/vmm/amd/vmcb.h
index d40a9993a31d..348fddc67c22 100644
--- a/sys/amd64/vmm/amd/vmcb.h
+++ b/sys/amd64/vmm/amd/vmcb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/ept.c b/sys/amd64/vmm/intel/ept.c
index 4d75d5547890..b9825d6d2d9d 100644
--- a/sys/amd64/vmm/intel/ept.c
+++ b/sys/amd64/vmm/intel/ept.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/ept.h b/sys/amd64/vmm/intel/ept.h
index 4a029e8b22df..1036ba900162 100644
--- a/sys/amd64/vmm/intel/ept.h
+++ b/sys/amd64/vmm/intel/ept.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c
index aed21d2f4d15..2de10d8afce0 100644
--- a/sys/amd64/vmm/intel/vmcs.c
+++ b/sys/amd64/vmm/intel/vmcs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmcs.h b/sys/amd64/vmm/intel/vmcs.h
index 5c5214c65609..e2700ee1dd6e 100644
--- a/sys/amd64/vmm/intel/vmcs.h
+++ b/sys/amd64/vmm/intel/vmcs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index fe8f9b40a7d0..3a0693a29e80 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
index ad172073b03f..c2156ee2cc90 100644
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx_controls.h b/sys/amd64/vmm/intel/vmx_controls.h
index 5408d129ad45..2b5a765c95e8 100644
--- a/sys/amd64/vmm/intel/vmx_controls.h
+++ b/sys/amd64/vmm/intel/vmx_controls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx_cpufunc.h b/sys/amd64/vmm/intel/vmx_cpufunc.h
index 05ac56290cb9..33785901f430 100644
--- a/sys/amd64/vmm/intel/vmx_cpufunc.h
+++ b/sys/amd64/vmm/intel/vmx_cpufunc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx_genassym.c b/sys/amd64/vmm/intel/vmx_genassym.c
index d428dad2b71c..a85b8101cabe 100644
--- a/sys/amd64/vmm/intel/vmx_genassym.c
+++ b/sys/amd64/vmm/intel/vmx_genassym.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
index 60f6fad7d9d6..450d44774441 100644
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx_msr.h b/sys/amd64/vmm/intel/vmx_msr.h
index 1b42d32e3407..4c5052287f5d 100644
--- a/sys/amd64/vmm/intel/vmx_msr.h
+++ b/sys/amd64/vmm/intel/vmx_msr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/intel/vmx_support.S b/sys/amd64/vmm/intel/vmx_support.S
index b4101e1b78a1..20f75cb11788 100644
--- a/sys/amd64/vmm/intel/vmx_support.S
+++ b/sys/amd64/vmm/intel/vmx_support.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
diff --git a/sys/amd64/vmm/intel/vtd.c b/sys/amd64/vmm/intel/vtd.c
index c3af7779a7ca..0dd2a956ff67 100644
--- a/sys/amd64/vmm/intel/vtd.c
+++ b/sys/amd64/vmm/intel/vtd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/iommu.c b/sys/amd64/vmm/io/iommu.c
index 6a589f153815..a0ab296f16de 100644
--- a/sys/amd64/vmm/io/iommu.c
+++ b/sys/amd64/vmm/io/iommu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/iommu.h b/sys/amd64/vmm/io/iommu.h
index 090415b57505..787841b4bb69 100644
--- a/sys/amd64/vmm/io/iommu.h
+++ b/sys/amd64/vmm/io/iommu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c
index ea04c3245671..a0dbed02f11f 100644
--- a/sys/amd64/vmm/io/ppt.c
+++ b/sys/amd64/vmm/io/ppt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h
index e7833c2a73bb..533ef711de9b 100644
--- a/sys/amd64/vmm/io/ppt.h
+++ b/sys/amd64/vmm/io/ppt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vatpic.c b/sys/amd64/vmm/io/vatpic.c
index d959909d7cdc..bb23bb8bd438 100644
--- a/sys/amd64/vmm/io/vatpic.c
+++ b/sys/amd64/vmm/io/vatpic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vatpit.h b/sys/amd64/vmm/io/vatpit.h
index 96ed9c231420..bebe1f2b79fc 100644
--- a/sys/amd64/vmm/io/vatpit.h
+++ b/sys/amd64/vmm/io/vatpit.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2011 NetApp, Inc.
diff --git a/sys/amd64/vmm/io/vhpet.c b/sys/amd64/vmm/io/vhpet.c
index 7e73684ebad2..1ac451d112a5 100644
--- a/sys/amd64/vmm/io/vhpet.c
+++ b/sys/amd64/vmm/io/vhpet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
diff --git a/sys/amd64/vmm/io/vhpet.h b/sys/amd64/vmm/io/vhpet.h
index 43a1fde1126e..12d62cd3e351 100644
--- a/sys/amd64/vmm/io/vhpet.h
+++ b/sys/amd64/vmm/io/vhpet.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c
index 00a206fa604d..77137ef6cc10 100644
--- a/sys/amd64/vmm/io/vioapic.c
+++ b/sys/amd64/vmm/io/vioapic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h
index 988321a6435c..5326fc7017fc 100644
--- a/sys/amd64/vmm/io/vioapic.h
+++ b/sys/amd64/vmm/io/vioapic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
index 2144cbabd979..45a70e494e62 100644
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vlapic.h b/sys/amd64/vmm/io/vlapic.h
index f6dd9493a5eb..be3d6d2106cc 100644
--- a/sys/amd64/vmm/io/vlapic.h
+++ b/sys/amd64/vmm/io/vlapic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vlapic_priv.h b/sys/amd64/vmm/io/vlapic_priv.h
index ccae4b748880..e0c11ee76dcb 100644
--- a/sys/amd64/vmm/io/vlapic_priv.h
+++ b/sys/amd64/vmm/io/vlapic_priv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vpmtmr.c b/sys/amd64/vmm/io/vpmtmr.c
index 825d0151c333..42645848461b 100644
--- a/sys/amd64/vmm/io/vpmtmr.c
+++ b/sys/amd64/vmm/io/vpmtmr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014, Neel Natu (neel@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vpmtmr.h b/sys/amd64/vmm/io/vpmtmr.h
index 4ad5efcf2034..d16650f331d2 100644
--- a/sys/amd64/vmm/io/vpmtmr.h
+++ b/sys/amd64/vmm/io/vpmtmr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Neel Natu (neel@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vrtc.c b/sys/amd64/vmm/io/vrtc.c
index 9cf70027f3d8..87eee4e41151 100644
--- a/sys/amd64/vmm/io/vrtc.c
+++ b/sys/amd64/vmm/io/vrtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014, Neel Natu (neel@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/io/vrtc.h b/sys/amd64/vmm/io/vrtc.h
index 0f11b8d5fc53..f029218a5cc6 100644
--- a/sys/amd64/vmm/io/vrtc.h
+++ b/sys/amd64/vmm/io/vrtc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Neel Natu (neel@freebsd.org)
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 1b5e6946d785..3663df97d37e 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 2d8ff43a74dd..0bcb4511f461 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_host.c b/sys/amd64/vmm/vmm_host.c
index 4a36296beab2..78170c3cead7 100644
--- a/sys/amd64/vmm/vmm_host.c
+++ b/sys/amd64/vmm/vmm_host.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_host.h b/sys/amd64/vmm/vmm_host.h
index f750a977324b..965cafac3264 100644
--- a/sys/amd64/vmm/vmm_host.h
+++ b/sys/amd64/vmm/vmm_host.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c
index 32791762c9fe..5beb00977ae0 100644
--- a/sys/amd64/vmm/vmm_instruction_emul.c
+++ b/sys/amd64/vmm/vmm_instruction_emul.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Sandvine, Inc.
* Copyright (c) 2012 NetApp, Inc.
diff --git a/sys/amd64/vmm/vmm_ioport.c b/sys/amd64/vmm/vmm_ioport.c
index 24c556a3c8ae..a115e3e6a328 100644
--- a/sys/amd64/vmm/vmm_ioport.c
+++ b/sys/amd64/vmm/vmm_ioport.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_ioport.h b/sys/amd64/vmm/vmm_ioport.h
index 0b6f09f01e9a..0991bce68afd 100644
--- a/sys/amd64/vmm/vmm_ioport.h
+++ b/sys/amd64/vmm/vmm_ioport.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_ktr.h b/sys/amd64/vmm/vmm_ktr.h
index 414d0341cca9..4ec0861da004 100644
--- a/sys/amd64/vmm/vmm_ktr.h
+++ b/sys/amd64/vmm/vmm_ktr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c
index 1b6c51c8283c..de3448b8777f 100644
--- a/sys/amd64/vmm/vmm_lapic.c
+++ b/sys/amd64/vmm/vmm_lapic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_lapic.h b/sys/amd64/vmm/vmm_lapic.h
index a361cd09c332..3b2a2d562953 100644
--- a/sys/amd64/vmm/vmm_lapic.h
+++ b/sys/amd64/vmm/vmm_lapic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_mem.c b/sys/amd64/vmm/vmm_mem.c
index a736d94bba64..2466ac4d85cd 100644
--- a/sys/amd64/vmm/vmm_mem.c
+++ b/sys/amd64/vmm/vmm_mem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_mem.h b/sys/amd64/vmm/vmm_mem.h
index 4a010a2f9f0a..d9187c077d9b 100644
--- a/sys/amd64/vmm/vmm_mem.h
+++ b/sys/amd64/vmm/vmm_mem.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_snapshot.c b/sys/amd64/vmm/vmm_snapshot.c
index 1e5f57028523..afc8e88b3989 100644
--- a/sys/amd64/vmm/vmm_snapshot.c
+++ b/sys/amd64/vmm/vmm_snapshot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Flavius Anton
* Copyright (c) 2016 Mihai Tiganus
diff --git a/sys/amd64/vmm/vmm_stat.c b/sys/amd64/vmm/vmm_stat.c
index 2df4423bc60f..e0a4250369e8 100644
--- a/sys/amd64/vmm/vmm_stat.c
+++ b/sys/amd64/vmm/vmm_stat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_util.c b/sys/amd64/vmm/vmm_util.c
index b75a1b25eeb6..8052f62766a9 100644
--- a/sys/amd64/vmm/vmm_util.c
+++ b/sys/amd64/vmm/vmm_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/vmm_util.h b/sys/amd64/vmm/vmm_util.h
index 130330c2686a..1cc569b95c1a 100644
--- a/sys/amd64/vmm/vmm_util.h
+++ b/sys/amd64/vmm/vmm_util.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index 265d9f6951a0..6b39172c8622 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/amd64/vmm/x86.h b/sys/amd64/vmm/x86.h
index 03e3ffae3036..d9841e33a2e9 100644
--- a/sys/amd64/vmm/x86.h
+++ b/sys/amd64/vmm/x86.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/sys/arm/allwinner/a10_sramc.c b/sys/arm/allwinner/a10_sramc.c
index 2227b12c3674..8854b47aa7a4 100644
--- a/sys/arm/allwinner/a10_sramc.c
+++ b/sys/arm/allwinner/a10_sramc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/allwinner/a10_sramc.h b/sys/arm/allwinner/a10_sramc.h
index 882091319a67..ce4cadb19ebb 100644
--- a/sys/arm/allwinner/a10_sramc.h
+++ b/sys/arm/allwinner/a10_sramc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.c b/sys/arm/allwinner/a20/a20_cpu_cfg.c
index d26b30cd9449..f521819c2b6b 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.c
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.h b/sys/arm/allwinner/a20/a20_cpu_cfg.h
index 6f3d400f0edc..9651e7468c8d 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.h
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/allwinner/aw_dwc3.c b/sys/arm/allwinner/aw_dwc3.c
index 6f15fe18d10e..adc67a574a1a 100644
--- a/sys/arm/allwinner/aw_dwc3.c
+++ b/sys/arm/allwinner/aw_dwc3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.Org>
*
diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
index 1221384fb875..07d219288a81 100644
--- a/sys/arm/allwinner/aw_gpio.c
+++ b/sys/arm/allwinner/aw_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c
index 81dd34ce8c54..59f9f0481d67 100644
--- a/sys/arm/allwinner/aw_mmc.c
+++ b/sys/arm/allwinner/aw_mmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
* Copyright (c) 2013 Alexander Fedorov
diff --git a/sys/arm/allwinner/aw_mmc.h b/sys/arm/allwinner/aw_mmc.h
index 18308b55cc43..19a572c62c67 100644
--- a/sys/arm/allwinner/aw_mmc.h
+++ b/sys/arm/allwinner/aw_mmc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
* Copyright (c) 2013 Alexander Fedorov <alexander.fedorov@rtlservice.com>
diff --git a/sys/arm/allwinner/aw_pwm.c b/sys/arm/allwinner/aw_pwm.c
index a851005115f5..d6539c29086b 100644
--- a/sys/arm/allwinner/aw_pwm.c
+++ b/sys/arm/allwinner/aw_pwm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm/allwinner/aw_syscon.c b/sys/arm/allwinner/aw_syscon.c
index f1a01dac8e1b..46faaa3afd7c 100644
--- a/sys/arm/allwinner/aw_syscon.c
+++ b/sys/arm/allwinner/aw_syscon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/arm/allwinner/clkng/aw_ccung.c b/sys/arm/allwinner/clkng/aw_ccung.c
index ba930b993f20..572320a2db1a 100644
--- a/sys/arm/allwinner/clkng/aw_ccung.c
+++ b/sys/arm/allwinner/clkng/aw_ccung.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/aw_ccung.h b/sys/arm/allwinner/clkng/aw_ccung.h
index 6a5c2fff2dde..4e3b8ec711d5 100644
--- a/sys/arm/allwinner/clkng/aw_ccung.h
+++ b/sys/arm/allwinner/clkng/aw_ccung.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/aw_clk_nmm.c b/sys/arm/allwinner/clkng/aw_clk_nmm.c
index e12e83e4fae5..0b2d055b0c76 100644
--- a/sys/arm/allwinner/clkng/aw_clk_nmm.c
+++ b/sys/arm/allwinner/clkng/aw_clk_nmm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/aw_clk_nmm.h b/sys/arm/allwinner/clkng/aw_clk_nmm.h
index e53d44d3b612..857a8d2d7955 100644
--- a/sys/arm/allwinner/clkng/aw_clk_nmm.h
+++ b/sys/arm/allwinner/clkng/aw_clk_nmm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/aw_clk_np.c b/sys/arm/allwinner/clkng/aw_clk_np.c
index 566f9c1d6f91..39fec5655f67 100644
--- a/sys/arm/allwinner/clkng/aw_clk_np.c
+++ b/sys/arm/allwinner/clkng/aw_clk_np.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/aw_clk_np.h b/sys/arm/allwinner/clkng/aw_clk_np.h
index 4997adb19d9c..046fd7a0c53c 100644
--- a/sys/arm/allwinner/clkng/aw_clk_np.h
+++ b/sys/arm/allwinner/clkng/aw_clk_np.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_a10.c b/sys/arm/allwinner/clkng/ccu_a10.c
index 182a19f35e98..5f47f9bb86d1 100644
--- a/sys/arm/allwinner/clkng/ccu_a10.c
+++ b/sys/arm/allwinner/clkng/ccu_a10.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_a13.c b/sys/arm/allwinner/clkng/ccu_a13.c
index dbe4e1364f14..1109758f86ad 100644
--- a/sys/arm/allwinner/clkng/ccu_a13.c
+++ b/sys/arm/allwinner/clkng/ccu_a13.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_a31.c b/sys/arm/allwinner/clkng/ccu_a31.c
index b19bebfe1786..8fdd3d77f819 100644
--- a/sys/arm/allwinner/clkng/ccu_a31.c
+++ b/sys/arm/allwinner/clkng/ccu_a31.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_a64.c b/sys/arm/allwinner/clkng/ccu_a64.c
index 41f531596475..9fd9dd8747c7 100644
--- a/sys/arm/allwinner/clkng/ccu_a64.c
+++ b/sys/arm/allwinner/clkng/ccu_a64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_a83t.c b/sys/arm/allwinner/clkng/ccu_a83t.c
index c32b1d624161..a596a416811b 100644
--- a/sys/arm/allwinner/clkng/ccu_a83t.c
+++ b/sys/arm/allwinner/clkng/ccu_a83t.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_de2.c b/sys/arm/allwinner/clkng/ccu_de2.c
index 84a2681abeb9..09566687ee47 100644
--- a/sys/arm/allwinner/clkng/ccu_de2.c
+++ b/sys/arm/allwinner/clkng/ccu_de2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_h3.c b/sys/arm/allwinner/clkng/ccu_h3.c
index 72e257c98d73..f0441154644d 100644
--- a/sys/arm/allwinner/clkng/ccu_h3.c
+++ b/sys/arm/allwinner/clkng/ccu_h3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_h6.c b/sys/arm/allwinner/clkng/ccu_h6.c
index dbecaaff0e6b..4e3964db12c8 100644
--- a/sys/arm/allwinner/clkng/ccu_h6.c
+++ b/sys/arm/allwinner/clkng/ccu_h6.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_h6_r.c b/sys/arm/allwinner/clkng/ccu_h6_r.c
index 1f1ca8c1054a..e9c53253b654 100644
--- a/sys/arm/allwinner/clkng/ccu_h6_r.c
+++ b/sys/arm/allwinner/clkng/ccu_h6_r.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/clkng/ccu_sun8i_r.c b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
index 05558f4dc73e..96c9fbeb27b8 100644
--- a/sys/arm/allwinner/clkng/ccu_sun8i_r.c
+++ b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017,2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index 5110ce2f9fb4..f61cd8c903e2 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/allwinner/if_emacreg.h b/sys/arm/allwinner/if_emacreg.h
index f84e92c56e04..6b7ea2c41759 100644
--- a/sys/arm/allwinner/if_emacreg.h
+++ b/sys/arm/allwinner/if_emacreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index 3cd4abe902f1..9e8e240af9e3 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2015 Ian Lepore
* Copyright (c) 2010 Mark Tinguely
diff --git a/sys/arm/arm/dump_machdep.c b/sys/arm/arm/dump_machdep.c
index ead54ca7b225..7bee0ecfc58c 100644
--- a/sys/arm/arm/dump_machdep.c
+++ b/sys/arm/arm/dump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index 724b3437458e..237e948e881f 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/arm/arm/gdb_machdep.c b/sys/arm/arm/gdb_machdep.c
index d42892972556..74c418f357f2 100644
--- a/sys/arm/arm/gdb_machdep.c
+++ b/sys/arm/arm/gdb_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index e90bbff6549a..ecda55a9dd24 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c
index 8a74dc9818ba..fbfcdf8691d9 100644
--- a/sys/arm/arm/minidump_machdep.c
+++ b/sys/arm/arm/minidump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
index 4089af5929eb..682599b41fca 100644
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Semihalf.
* All rights reserved.
diff --git a/sys/arm/arm/pl190.c b/sys/arm/arm/pl190.c
index a8ca18effb8c..e1b4c944a5b0 100644
--- a/sys/arm/arm/pl190.c
+++ b/sys/arm/arm/pl190.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2017 Oleksandr Tymoshenko <gonzo@bluezbox.com>
* All rights reserved.
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index 51438274f1ff..ab033bc41e8f 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause
*
* Copyright (c) 1991 Regents of the University of California.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/arm/arm/sc_machdep.c b/sys/arm/arm/sc_machdep.c
index 4e2fd65bce14..00d1ba71e6ef 100644
--- a/sys/arm/arm/sc_machdep.c
+++ b/sys/arm/arm/sc_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/sys/arm/arm/stdatomic.c b/sys/arm/arm/stdatomic.c
index bf7ed20c117d..6df637368f72 100644
--- a/sys/arm/arm/stdatomic.c
+++ b/sys/arm/arm/stdatomic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/arm/vfp.c b/sys/arm/arm/vfp.c
index 3fa53c7ae2eb..518bcb2e081d 100644
--- a/sys/arm/arm/vfp.c
+++ b/sys/arm/arm/vfp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2012 Mark Tinguely
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
index 7c24d6a5959c..54ac57f01e0c 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Tsubai Masanari.
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h b/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
index 4b9532053807..c1ee11be1c70 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h b/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
index b57607ea597e..1c307bf1d17a 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_clkman.c b/sys/arm/broadcom/bcm2835/bcm2835_clkman.c
index 28247b5b9847..05804f490f4c 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_clkman.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_clkman.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Poul-Henning Kamp <phk@FreeBSD.org>
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_clkman.h b/sys/arm/broadcom/bcm2835/bcm2835_clkman.h
index 488bb1d65504..2dcd51c9a0bd 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_clkman.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_clkman.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Poul-Henning Kamp <phk@FreeBSD.org>
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index f596303959da..5792b45e7afa 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Daisuke Aoyama <aoyama@peach.ne.jp>
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@bluezbox.com>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.h b/sys/arm/broadcom/bcm2835/bcm2835_dma.h
index 44c2cd34e804..f8cd0ae085b7 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Daisuke Aoyama <aoyama@peach.ne.jp>
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@bluezbox.com>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index 40c4a29c3e95..072665861eaa 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
index 93849b3551d9..8e0568868fc2 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012, 2013 The FreeBSD Foundation
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index 82b38e925448..55b59bbc375f 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2012-2015 Luiz Otavio O Souza <loos@FreeBSD.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index 93c044fe6419..9b05d758c3b9 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
index d31989b7ddeb..790408e9f0b9 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.h b/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
index 3cd8699a704b..e50b3fb439fb 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_pwm.c b/sys/arm/broadcom/bcm2835/bcm2835_pwm.c
index 348c1435f85d..7904d80f0768 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_pwm.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_pwm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Poul-Henning Kamp <phk@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
index 8225abcb624c..63d815e49aeb 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
index 5eb94c6f360f..477e1d04023a 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Klaus P. Ohrhallinger <k@7he.at>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
index f659bcc5023e..36b103f6758c 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spi.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spireg.h b/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
index a658f16c92b9..9551a88b45ca 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spivar.h b/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
index 75a17a449cb5..5d20b70f9890 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2013 Luiz Otavio O Souza <loos@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index c5c3435b6ef7..811cd82e0545 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Damjan Marion <dmarion@freebsd.org>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c
index 7e5033f032c4..a463ebfe8405 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
index 77b408311e61..617482c4b54f 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
index 816123943a2a..247efcc917ad 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Alexander Rybalko <ray@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
index 214991820fdc..00a85333d39b 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Alexander Rybalko <ray@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c b/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
index d79d39ff1497..85bff6a0cd31 100644
--- a/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
+++ b/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2012-2015 Luiz Otavio O Souza <loos@FreeBSD.org>
diff --git a/sys/arm/freescale/fsl_ocotp.c b/sys/arm/freescale/fsl_ocotp.c
index ddfeedb5e15a..f945901d7eab 100644
--- a/sys/arm/freescale/fsl_ocotp.c
+++ b/sys/arm/freescale/fsl_ocotp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
diff --git a/sys/arm/freescale/fsl_ocotpreg.h b/sys/arm/freescale/fsl_ocotpreg.h
index 80e3d3e5644f..6b3fa90634b3 100644
--- a/sys/arm/freescale/fsl_ocotpreg.h
+++ b/sys/arm/freescale/fsl_ocotpreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
diff --git a/sys/arm/freescale/fsl_ocotpvar.h b/sys/arm/freescale/fsl_ocotpvar.h
index ca7dd13e8c54..451e535eb21b 100644
--- a/sys/arm/freescale/fsl_ocotpvar.h
+++ b/sys/arm/freescale/fsl_ocotpvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c
index 3db5c982b59a..9afd646ce216 100644
--- a/sys/arm/freescale/imx/imx51_ccm.c
+++ b/sys/arm/freescale/imx/imx51_ccm.c
@@ -1,6 +1,6 @@
/* $NetBSD: imx51_ccm.c,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/arm/freescale/imx/imx51_ccmreg.h b/sys/arm/freescale/imx/imx51_ccmreg.h
index f9c75f30f279..504c6e9ef126 100644
--- a/sys/arm/freescale/imx/imx51_ccmreg.h
+++ b/sys/arm/freescale/imx/imx51_ccmreg.h
@@ -1,6 +1,6 @@
/* $NetBSD: imx51_ccmreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/arm/freescale/imx/imx51_ccmvar.h b/sys/arm/freescale/imx/imx51_ccmvar.h
index acbb35a7e71d..dc35f1bc7116 100644
--- a/sys/arm/freescale/imx/imx51_ccmvar.h
+++ b/sys/arm/freescale/imx/imx51_ccmvar.h
@@ -1,6 +1,6 @@
/* $NetBSD: imx51_ccmvar.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/arm/freescale/imx/imx51_dpllreg.h b/sys/arm/freescale/imx/imx51_dpllreg.h
index d224333a9830..a98f255fb036 100644
--- a/sys/arm/freescale/imx/imx51_dpllreg.h
+++ b/sys/arm/freescale/imx/imx51_dpllreg.h
@@ -1,6 +1,6 @@
/* $NetBSD: imx51_dpllreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/arm/freescale/imx/imx51_ipuv3.c b/sys/arm/freescale/imx/imx51_ipuv3.c
index a29a562719d4..7947d1a3d665 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012, 2013 The FreeBSD Foundation
diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
index 644664fa8aa3..560578209cf3 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012, 2013 The FreeBSD Foundation
diff --git a/sys/arm/freescale/imx/imx51_ipuv3reg.h b/sys/arm/freescale/imx/imx51_ipuv3reg.h
index 137c75033812..16e52e405784 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3reg.h
+++ b/sys/arm/freescale/imx/imx51_ipuv3reg.h
@@ -1,6 +1,6 @@
/* $NetBSD: imx51_ipuv3reg.h,v 1.1 2012/04/17 10:19:57 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/arm/freescale/imx/imx51_machdep.c b/sys/arm/freescale/imx/imx51_machdep.c
index 3a675f34b720..056ca477656e 100644
--- a/sys/arm/freescale/imx/imx51_machdep.c
+++ b/sys/arm/freescale/imx/imx51_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx51_sdmareg.h b/sys/arm/freescale/imx/imx51_sdmareg.h
index 7c6f14a3e715..9d0e19f52abc 100644
--- a/sys/arm/freescale/imx/imx51_sdmareg.h
+++ b/sys/arm/freescale/imx/imx51_sdmareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/imx/imx51_ssireg.h b/sys/arm/freescale/imx/imx51_ssireg.h
index 05c01a79a449..f4fc918d53d8 100644
--- a/sys/arm/freescale/imx/imx51_ssireg.h
+++ b/sys/arm/freescale/imx/imx51_ssireg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/imx/imx51_tzicreg.h b/sys/arm/freescale/imx/imx51_tzicreg.h
index 0c3c811e00de..3311dfffb3d5 100644
--- a/sys/arm/freescale/imx/imx51_tzicreg.h
+++ b/sys/arm/freescale/imx/imx51_tzicreg.h
@@ -1,6 +1,6 @@
/* $NetBSD: imx51_tzicreg.h,v 1.1 2010/11/13 07:11:03 bsh Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2010 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/arm/freescale/imx/imx53_machdep.c b/sys/arm/freescale/imx/imx53_machdep.c
index 8530ed193520..1b5c73296aa6 100644
--- a/sys/arm/freescale/imx/imx53_machdep.c
+++ b/sys/arm/freescale/imx/imx53_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_anatop.c b/sys/arm/freescale/imx/imx6_anatop.c
index a233cf9ab354..3bbdb383069e 100644
--- a/sys/arm/freescale/imx/imx6_anatop.c
+++ b/sys/arm/freescale/imx/imx6_anatop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2014 Steven Lawrance <stl@koffein.net>
diff --git a/sys/arm/freescale/imx/imx6_anatopreg.h b/sys/arm/freescale/imx/imx6_anatopreg.h
index e82695261328..f90ebc4d8624 100644
--- a/sys/arm/freescale/imx/imx6_anatopreg.h
+++ b/sys/arm/freescale/imx/imx6_anatopreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_anatopvar.h b/sys/arm/freescale/imx/imx6_anatopvar.h
index 7378bf245b54..ff3489ccca69 100644
--- a/sys/arm/freescale/imx/imx6_anatopvar.h
+++ b/sys/arm/freescale/imx/imx6_anatopvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_ccm.c b/sys/arm/freescale/imx/imx6_ccm.c
index 5bdb71caa4bd..56d00e2de3d1 100644
--- a/sys/arm/freescale/imx/imx6_ccm.c
+++ b/sys/arm/freescale/imx/imx6_ccm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_ccmreg.h b/sys/arm/freescale/imx/imx6_ccmreg.h
index dfa7aad45cd7..385a3d9f7180 100644
--- a/sys/arm/freescale/imx/imx6_ccmreg.h
+++ b/sys/arm/freescale/imx/imx6_ccmreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index d08baa8af188..b8e4dc7fc671 100644
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index ea7c8cc3a293..66c34e8b5a0d 100644
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Juergen Weiss <weiss@uni-mainz.de>
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
diff --git a/sys/arm/freescale/imx/imx6_pl310.c b/sys/arm/freescale/imx/imx6_pl310.c
index 8bf832e916f0..6f1335a043d7 100644
--- a/sys/arm/freescale/imx/imx6_pl310.c
+++ b/sys/arm/freescale/imx/imx6_pl310.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard.
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx6_usbphy.c b/sys/arm/freescale/imx/imx6_usbphy.c
index 56d3cce907a6..d03be5789acc 100644
--- a/sys/arm/freescale/imx/imx6_usbphy.c
+++ b/sys/arm/freescale/imx/imx6_usbphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx_gpt.c b/sys/arm/freescale/imx/imx_gpt.c
index 0605f5ca3558..67f24deac7e6 100644
--- a/sys/arm/freescale/imx/imx_gpt.c
+++ b/sys/arm/freescale/imx/imx_gpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/imx/imx_gptreg.h b/sys/arm/freescale/imx/imx_gptreg.h
index f37f94b88425..c4daaeef3c07 100644
--- a/sys/arm/freescale/imx/imx_gptreg.h
+++ b/sys/arm/freescale/imx/imx_gptreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/imx/imx_machdep.c b/sys/arm/freescale/imx/imx_machdep.c
index d920c41171b7..0b774502bc2d 100644
--- a/sys/arm/freescale/imx/imx_machdep.c
+++ b/sys/arm/freescale/imx/imx_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx_machdep.h b/sys/arm/freescale/imx/imx_machdep.h
index a030a0791af6..a400a1b19e7d 100644
--- a/sys/arm/freescale/imx/imx_machdep.h
+++ b/sys/arm/freescale/imx/imx_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx_nop_usbphy.c b/sys/arm/freescale/imx/imx_nop_usbphy.c
index 200511b2c273..003d3210e4d4 100644
--- a/sys/arm/freescale/imx/imx_nop_usbphy.c
+++ b/sys/arm/freescale/imx/imx_nop_usbphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx_spi.c b/sys/arm/freescale/imx/imx_spi.c
index 6624955ff124..c318eb067cb1 100644
--- a/sys/arm/freescale/imx/imx_spi.c
+++ b/sys/arm/freescale/imx/imx_spi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/freescale/imx/imx_wdog.c b/sys/arm/freescale/imx/imx_wdog.c
index 287a8771f791..d3baa82bb825 100644
--- a/sys/arm/freescale/imx/imx_wdog.c
+++ b/sys/arm/freescale/imx/imx_wdog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/imx/imx_wdogreg.h b/sys/arm/freescale/imx/imx_wdogreg.h
index a66ca5adfc8e..cc989b75dbf1 100644
--- a/sys/arm/freescale/imx/imx_wdogreg.h
+++ b/sys/arm/freescale/imx/imx_wdogreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/imx/tzic.c b/sys/arm/freescale/imx/tzic.c
index cddbd6ba9919..95531e75fb2f 100644
--- a/sys/arm/freescale/imx/tzic.c
+++ b/sys/arm/freescale/imx/tzic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 The FreeBSD Foundation
*
diff --git a/sys/arm/freescale/vybrid/vf_anadig.c b/sys/arm/freescale/vybrid/vf_anadig.c
index a8f944baf5fe..715263739ffa 100644
--- a/sys/arm/freescale/vybrid/vf_anadig.c
+++ b/sys/arm/freescale/vybrid/vf_anadig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
index bfb957338af7..92a9532a06a3 100644
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_common.h b/sys/arm/freescale/vybrid/vf_common.h
index ab3c57fd3c81..fc099574f306 100644
--- a/sys/arm/freescale/vybrid/vf_common.h
+++ b/sys/arm/freescale/vybrid/vf_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_dcu4.c b/sys/arm/freescale/vybrid/vf_dcu4.c
index 9e455d6027c6..203690895336 100644
--- a/sys/arm/freescale/vybrid/vf_dcu4.c
+++ b/sys/arm/freescale/vybrid/vf_dcu4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_dmamux.c b/sys/arm/freescale/vybrid/vf_dmamux.c
index 978bab5fc1c7..547f95d1412e 100644
--- a/sys/arm/freescale/vybrid/vf_dmamux.c
+++ b/sys/arm/freescale/vybrid/vf_dmamux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_dmamux.h b/sys/arm/freescale/vybrid/vf_dmamux.h
index 8b3a2b959b42..12f7e12686a3 100644
--- a/sys/arm/freescale/vybrid/vf_dmamux.h
+++ b/sys/arm/freescale/vybrid/vf_dmamux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_edma.c b/sys/arm/freescale/vybrid/vf_edma.c
index 23ce8cfd2c8d..0214d1ba6880 100644
--- a/sys/arm/freescale/vybrid/vf_edma.c
+++ b/sys/arm/freescale/vybrid/vf_edma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_edma.h b/sys/arm/freescale/vybrid/vf_edma.h
index 72968e7ce79e..8053e5048743 100644
--- a/sys/arm/freescale/vybrid/vf_edma.h
+++ b/sys/arm/freescale/vybrid/vf_edma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_ehci.c b/sys/arm/freescale/vybrid/vf_ehci.c
index 8c1ddfc7d79e..c7182b31c709 100644
--- a/sys/arm/freescale/vybrid/vf_ehci.c
+++ b/sys/arm/freescale/vybrid/vf_ehci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_gpio.c b/sys/arm/freescale/vybrid/vf_gpio.c
index cfa40693dfbe..3f485bfc7430 100644
--- a/sys/arm/freescale/vybrid/vf_gpio.c
+++ b/sys/arm/freescale/vybrid/vf_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index ba2a72fb2757..08a15574b637 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.c b/sys/arm/freescale/vybrid/vf_iomuxc.c
index e46dd31c2efb..beef3655976e 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.c
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.h b/sys/arm/freescale/vybrid/vf_iomuxc.h
index 3dc1bcdcbe2f..308572a9259b 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.h
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_machdep.c b/sys/arm/freescale/vybrid/vf_machdep.c
index 6c5b7bcf3755..a085fdfa7227 100644
--- a/sys/arm/freescale/vybrid/vf_machdep.c
+++ b/sys/arm/freescale/vybrid/vf_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_mscm.c b/sys/arm/freescale/vybrid/vf_mscm.c
index aa29175468af..2a78d6098330 100644
--- a/sys/arm/freescale/vybrid/vf_mscm.c
+++ b/sys/arm/freescale/vybrid/vf_mscm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_port.c b/sys/arm/freescale/vybrid/vf_port.c
index d04cf4a08b37..f120ed4e4405 100644
--- a/sys/arm/freescale/vybrid/vf_port.c
+++ b/sys/arm/freescale/vybrid/vf_port.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_port.h b/sys/arm/freescale/vybrid/vf_port.h
index e046a8fcba83..b6fbc8f35e9a 100644
--- a/sys/arm/freescale/vybrid/vf_port.h
+++ b/sys/arm/freescale/vybrid/vf_port.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c
index 26ba34df5009..f19df57ed9a4 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_src.c b/sys/arm/freescale/vybrid/vf_src.c
index bd1467819e2c..3d6765a19ea4 100644
--- a/sys/arm/freescale/vybrid/vf_src.c
+++ b/sys/arm/freescale/vybrid/vf_src.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_src.h b/sys/arm/freescale/vybrid/vf_src.h
index 09bcfb2b4d06..1a03ca568eaa 100644
--- a/sys/arm/freescale/vybrid/vf_src.h
+++ b/sys/arm/freescale/vybrid/vf_src.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_tcon.c b/sys/arm/freescale/vybrid/vf_tcon.c
index 475f86271c45..00a2f73d2058 100644
--- a/sys/arm/freescale/vybrid/vf_tcon.c
+++ b/sys/arm/freescale/vybrid/vf_tcon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/freescale/vybrid/vf_uart.c b/sys/arm/freescale/vybrid/vf_uart.c
index 50a0f9104e28..24ddb2c78fcc 100644
--- a/sys/arm/freescale/vybrid/vf_uart.c
+++ b/sys/arm/freescale/vybrid/vf_uart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h
index 803dda2e2763..73bed3d408c9 100644
--- a/sys/arm/include/_bus.h
+++ b/sys/arm/include/_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/arm/include/asmacros.h b/sys/arm/include/asmacros.h
index a41af82febba..f6302b7aaa2b 100644
--- a/sys/arm/include/asmacros.h
+++ b/sys/arm/include/asmacros.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard <cognet@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/include/atags.h b/sys/arm/include/atags.h
index baf39b5c0c69..db01c9f1f03e 100644
--- a/sys/arm/include/atags.h
+++ b/sys/arm/include/atags.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/arm/include/clock.h b/sys/arm/include/clock.h
index c9ac2039f836..430b0697e91f 100644
--- a/sys/arm/include/clock.h
+++ b/sys/arm/include/clock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
diff --git a/sys/arm/include/counter.h b/sys/arm/include/counter.h
index 203a1ebda64e..6957a0417d60 100644
--- a/sys/arm/include/counter.h
+++ b/sys/arm/include/counter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h
index 35d0fa55ca1a..6a63c3168a0e 100644
--- a/sys/arm/include/elf.h
+++ b/sys/arm/include/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1996-1997 John D. Polstra.
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h
index 37849d381372..93317ce874ed 100644
--- a/sys/arm/include/fdt.h
+++ b/sys/arm/include/fdt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/arm/include/gdb_machdep.h b/sys/arm/include/gdb_machdep.h
index 5190c2a4097e..d2077f102036 100644
--- a/sys/arm/include/gdb_machdep.h
+++ b/sys/arm/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
diff --git a/sys/arm/include/kdb.h b/sys/arm/include/kdb.h
index 728bf211dc62..fde37d148fb6 100644
--- a/sys/arm/include/kdb.h
+++ b/sys/arm/include/kdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/arm/include/memdev.h b/sys/arm/include/memdev.h
index b9b2172d4647..b560fcdbe297 100644
--- a/sys/arm/include/memdev.h
+++ b/sys/arm/include/memdev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/arm/include/metadata.h b/sys/arm/include/metadata.h
index 587fd901b379..d54db2072071 100644
--- a/sys/arm/include/metadata.h
+++ b/sys/arm/include/metadata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/include/minidump.h b/sys/arm/include/minidump.h
index d11e997d94dc..dcfef9cbbb27 100644
--- a/sys/arm/include/minidump.h
+++ b/sys/arm/include/minidump.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/arm/include/ofw_machdep.h b/sys/arm/include/ofw_machdep.h
index 1adbb02965c3..826ffee24772 100644
--- a/sys/arm/include/ofw_machdep.h
+++ b/sys/arm/include/ofw_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index a3a6900f692d..651d9d586ef4 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/include/pcpu_aux.h b/sys/arm/include/pcpu_aux.h
index 3d4c70c491d6..192254f649c7 100644
--- a/sys/arm/include/pcpu_aux.h
+++ b/sys/arm/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/arm/include/pl310.h b/sys/arm/include/pl310.h
index 39e8434097a7..63e606675810 100644
--- a/sys/arm/include/pl310.h
+++ b/sys/arm/include/pl310.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 8572602be35e..266900cca399 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Svatopluk Kraus
* Copyright (c) 2016 Michal Meloun
diff --git a/sys/arm/include/pmc_mdep.h b/sys/arm/include/pmc_mdep.h
index d7b80abb64b0..cd0f58cb1d78 100644
--- a/sys/arm/include/pmc_mdep.h
+++ b/sys/arm/include/pmc_mdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/include/runq.h b/sys/arm/include/runq.h
index ba21b9ab4316..2c98a4eadb2e 100644
--- a/sys/arm/include/runq.h
+++ b/sys/arm/include/runq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/include/sc_machdep.h b/sys/arm/include/sc_machdep.h
index 61a2a86f702d..ccd690899eb9 100644
--- a/sys/arm/include/sc_machdep.h
+++ b/sys/arm/include/sc_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/sys/arm/include/sf_buf.h b/sys/arm/include/sf_buf.h
index 65ef6f99b7a1..ce0f59bd5ac6 100644
--- a/sys/arm/include/sf_buf.h
+++ b/sys/arm/include/sf_buf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/arm/include/tls.h b/sys/arm/include/tls.h
index 9053bee9de12..de0aef5342ec 100644
--- a/sys/arm/include/tls.h
+++ b/sys/arm/include/tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/sys/arm/include/vdso.h b/sys/arm/include/vdso.h
index 8d805bba0d88..00c0c1010410 100644
--- a/sys/arm/include/vdso.h
+++ b/sys/arm/include/vdso.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/sys/arm/include/vfp.h b/sys/arm/include/vfp.h
index b9cc6efb9589..bc9d572d786a 100644
--- a/sys/arm/include/vfp.h
+++ b/sys/arm/include/vfp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Mark Tinguely
*
diff --git a/sys/arm/include/vm.h b/sys/arm/include/vm.h
index b9f72fe9a5f7..2fab1abe11b5 100644
--- a/sys/arm/include/vm.h
+++ b/sys/arm/include/vm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/arm/mv/a37x0_gpio.c b/sys/arm/mv/a37x0_gpio.c
index 6e9613b1ef7d..2ca32261533e 100644
--- a/sys/arm/mv/a37x0_gpio.c
+++ b/sys/arm/mv/a37x0_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018-2019, Rubicon Communications, LLC (Netgate)
* All rights reserved.
diff --git a/sys/arm/mv/a37x0_iic.c b/sys/arm/mv/a37x0_iic.c
index 041b2b1678dd..cc20d34c52a8 100644
--- a/sys/arm/mv/a37x0_iic.c
+++ b/sys/arm/mv/a37x0_iic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, 2019 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/a37x0_iicreg.h b/sys/arm/mv/a37x0_iicreg.h
index 37ea0ceefee4..9eb2b4b7746c 100644
--- a/sys/arm/mv/a37x0_iicreg.h
+++ b/sys/arm/mv/a37x0_iicreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, 2019 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/armadaxp/armadaxp.c b/sys/arm/mv/armadaxp/armadaxp.c
index bfd118d62705..82eb4135a756 100644
--- a/sys/arm/mv/armadaxp/armadaxp.c
+++ b/sys/arm/mv/armadaxp/armadaxp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Semihalf.
* All rights reserved.
diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c
index d6adf8b9ef97..7667afe82b9a 100644
--- a/sys/arm/mv/armadaxp/armadaxp_mp.c
+++ b/sys/arm/mv/armadaxp/armadaxp_mp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Semihalf.
* All rights reserved.
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index 7fd80cb7c3d7..ca675febed14 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c
index ed99ee646aec..1fb31f4eaa26 100644
--- a/sys/arm/mv/ic.c
+++ b/sys/arm/mv/ic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD.
diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c
index e235dcd07c7c..ce976a17641b 100644
--- a/sys/arm/mv/mpic.c
+++ b/sys/arm/mv/mpic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2007-2011 MARVELL INTERNATIONAL LTD.
diff --git a/sys/arm/mv/mv_ap806_clock.c b/sys/arm/mv/mv_ap806_clock.c
index 56041a48d312..25ae3e9d0a34 100644
--- a/sys/arm/mv/mv_ap806_clock.c
+++ b/sys/arm/mv/mv_ap806_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mv_ap806_gicp.c b/sys/arm/mv/mv_ap806_gicp.c
index da93a32f2b23..01d4d7967f47 100644
--- a/sys/arm/mv/mv_ap806_gicp.c
+++ b/sys/arm/mv/mv_ap806_gicp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mv_ap806_sei.c b/sys/arm/mv/mv_ap806_sei.c
index 5022e6765d0a..3b2bc8267f31 100644
--- a/sys/arm/mv/mv_ap806_sei.c
+++ b/sys/arm/mv/mv_ap806_sei.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm/mv/mv_armv7_machdep.c b/sys/arm/mv/mv_armv7_machdep.c
index e37d77b9bb1b..c7f5f0e4d13b 100644
--- a/sys/arm/mv/mv_armv7_machdep.c
+++ b/sys/arm/mv/mv_armv7_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Semihalf.
* Copyright (c) 1994-1998 Mark Brinicombe.
diff --git a/sys/arm/mv/mv_cp110_clock.c b/sys/arm/mv/mv_cp110_clock.c
index 84519b870d9a..ec47c22408ec 100644
--- a/sys/arm/mv/mv_cp110_clock.c
+++ b/sys/arm/mv/mv_cp110_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mv_cp110_clock.h b/sys/arm/mv/mv_cp110_clock.h
index 7c67254817e4..8175f1ef66a8 100644
--- a/sys/arm/mv/mv_cp110_clock.h
+++ b/sys/arm/mv/mv_cp110_clock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c
index 12dd6989e339..20242e27d29c 100644
--- a/sys/arm/mv/mv_cp110_icu.c
+++ b/sys/arm/mv/mv_cp110_icu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mv_cp110_icu_bus.c b/sys/arm/mv/mv_cp110_icu_bus.c
index c1c5f4ae7891..fe825187d222 100644
--- a/sys/arm/mv/mv_cp110_icu_bus.c
+++ b/sys/arm/mv/mv_cp110_icu_bus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/mv/mv_localbus.c b/sys/arm/mv/mv_localbus.c
index a313f9664242..411e907045ba 100644
--- a/sys/arm/mv/mv_localbus.c
+++ b/sys/arm/mv/mv_localbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Semihalf.
* All rights reserved.
diff --git a/sys/arm/mv/mv_thermal.c b/sys/arm/mv/mv_thermal.c
index ed47f25a40c1..ba856e1097c8 100644
--- a/sys/arm/mv/mv_thermal.c
+++ b/sys/arm/mv/mv_thermal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mv_ts.c b/sys/arm/mv/mv_ts.c
index 1a7b3981daad..2bf2b7234afb 100644
--- a/sys/arm/mv/mv_ts.c
+++ b/sys/arm/mv/mv_ts.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/mv/mvebu_pinctrl.c b/sys/arm/mv/mvebu_pinctrl.c
index 930c6878370f..c43274d0b55d 100644
--- a/sys/arm/mv/mvebu_pinctrl.c
+++ b/sys/arm/mv/mvebu_pinctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h
index c1e51fa6c62c..4144e6f89141 100644
--- a/sys/arm/mv/mvvar.h
+++ b/sys/arm/mv/mvvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index 14052ac2ca25..4bb0ca69e080 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice.
* Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD.
diff --git a/sys/arm/rockchip/rk32xx_machdep.c b/sys/arm/rockchip/rk32xx_machdep.c
index 8ee27f22dacd..42d6762f8a56 100644
--- a/sys/arm/rockchip/rk32xx_machdep.c
+++ b/sys/arm/rockchip/rk32xx_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm/rockchip/rk32xx_mp.c b/sys/arm/rockchip/rk32xx_mp.c
index 089db173a0e9..73d7c9db1000 100644
--- a/sys/arm/rockchip/rk32xx_mp.c
+++ b/sys/arm/rockchip/rk32xx_mp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm/rockchip/rk32xx_mp.h b/sys/arm/rockchip/rk32xx_mp.h
index bd63c3da756b..2e92f7852c9d 100644
--- a/sys/arm/rockchip/rk32xx_mp.h
+++ b/sys/arm/rockchip/rk32xx_mp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c
index 118a97e9f989..5792aa7ae25f 100644
--- a/sys/arm/ti/aintc.c
+++ b/sys/arm/ti/aintc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index eb869ca88b94..3ebc5ac0d894 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index 387bd37e3ebf..23d1274ae7ac 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_lcd.h b/sys/arm/ti/am335x/am335x_lcd.h
index f230a930e42d..2b94a96c6c8b 100644
--- a/sys/arm/ti/am335x/am335x_lcd.h
+++ b/sys/arm/ti/am335x/am335x_lcd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_lcd_syscons.c b/sys/arm/ti/am335x/am335x_lcd_syscons.c
index 9efd872f4ee0..7a5e141ba350 100644
--- a/sys/arm/ti/am335x/am335x_lcd_syscons.c
+++ b/sys/arm/ti/am335x/am335x_lcd_syscons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_pmic.c b/sys/arm/ti/am335x/am335x_pmic.c
index 0b0782ab72a6..a27ac620fd87 100644
--- a/sys/arm/ti/am335x/am335x_pmic.c
+++ b/sys/arm/ti/am335x/am335x_pmic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_pwm.h b/sys/arm/ti/am335x/am335x_pwm.h
index 956913dcc292..261fa3258ac0 100644
--- a/sys/arm/ti/am335x/am335x_pwm.h
+++ b/sys/arm/ti/am335x/am335x_pwm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_reg.h b/sys/arm/ti/am335x/am335x_reg.h
index 962238e7677b..a5d4b2d8a92e 100644
--- a/sys/arm/ti/am335x/am335x_reg.h
+++ b/sys/arm/ti/am335x/am335x_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_scm.h b/sys/arm/ti/am335x/am335x_scm.h
index ff7af52fe3b8..228a79d1fc93 100644
--- a/sys/arm/ti/am335x/am335x_scm.h
+++ b/sys/arm/ti/am335x/am335x_scm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/am335x/am335x_scm_padconf.c b/sys/arm/ti/am335x/am335x_scm_padconf.c
index 06be33278332..56bdd1f2722d 100644
--- a/sys/arm/ti/am335x/am335x_scm_padconf.c
+++ b/sys/arm/ti/am335x/am335x_scm_padconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/ti/clk/clock_common.c b/sys/arm/ti/clk/clock_common.c
index 15b0e75a8a1e..7f822ca1601e 100644
--- a/sys/arm/ti/clk/clock_common.c
+++ b/sys/arm/ti/clk/clock_common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/clock_common.h b/sys/arm/ti/clk/clock_common.h
index 148494f90331..5cd057e8a12a 100644
--- a/sys/arm/ti/clk/clock_common.h
+++ b/sys/arm/ti/clk/clock_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/ti_clk_clkctrl.c b/sys/arm/ti/clk/ti_clk_clkctrl.c
index 6b2fff5e12bb..9e0a9f4772b7 100644
--- a/sys/arm/ti/clk/ti_clk_clkctrl.c
+++ b/sys/arm/ti/clk/ti_clk_clkctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/ti_clk_clkctrl.h b/sys/arm/ti/clk/ti_clk_clkctrl.h
index d78736244815..d943e60aa3f7 100644
--- a/sys/arm/ti/clk/ti_clk_clkctrl.h
+++ b/sys/arm/ti/clk/ti_clk_clkctrl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/ti_clk_dpll.c b/sys/arm/ti/clk/ti_clk_dpll.c
index ed1c78b19dcb..f80be798a4d6 100644
--- a/sys/arm/ti/clk/ti_clk_dpll.c
+++ b/sys/arm/ti/clk/ti_clk_dpll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/ti/clk/ti_clk_dpll.h b/sys/arm/ti/clk/ti_clk_dpll.h
index 7505ac9abd63..ed0438e74390 100644
--- a/sys/arm/ti/clk/ti_clk_dpll.h
+++ b/sys/arm/ti/clk/ti_clk_dpll.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm/ti/clk/ti_clkctrl.c b/sys/arm/ti/clk/ti_clkctrl.c
index ee7d18fb0af8..eddd31c7737f 100644
--- a/sys/arm/ti/clk/ti_clkctrl.c
+++ b/sys/arm/ti/clk/ti_clkctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm/ti/clk/ti_divider_clock.c b/sys/arm/ti/clk/ti_divider_clock.c
index 753b5f535d29..fda23910d1bc 100644
--- a/sys/arm/ti/clk/ti_divider_clock.c
+++ b/sys/arm/ti/clk/ti_divider_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/ti_dpll_clock.c b/sys/arm/ti/clk/ti_dpll_clock.c
index 91127c570c4d..2d33c649149e 100644
--- a/sys/arm/ti/clk/ti_dpll_clock.c
+++ b/sys/arm/ti/clk/ti_dpll_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/ti_gate_clock.c b/sys/arm/ti/clk/ti_gate_clock.c
index b4fb65995e74..250d0c6401d9 100644
--- a/sys/arm/ti/clk/ti_gate_clock.c
+++ b/sys/arm/ti/clk/ti_gate_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/clk/ti_mux_clock.c b/sys/arm/ti/clk/ti_mux_clock.c
index bd232290e6a0..fb84f43b7fde 100644
--- a/sys/arm/ti/clk/ti_mux_clock.c
+++ b/sys/arm/ti/clk/ti_mux_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index ebf5644883f7..8fb552a26c0b 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
diff --git a/sys/arm/ti/cpsw/if_cpswreg.h b/sys/arm/ti/cpsw/if_cpswreg.h
index 9f73df19a064..d49efd7d1de9 100644
--- a/sys/arm/ti/cpsw/if_cpswreg.h
+++ b/sys/arm/ti/cpsw/if_cpswreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/cpsw/if_cpswvar.h b/sys/arm/ti/cpsw/if_cpswvar.h
index 9c51b76b9db4..578d8dc5635e 100644
--- a/sys/arm/ti/cpsw/if_cpswvar.h
+++ b/sys/arm/ti/cpsw/if_cpswvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/omap4/omap4_l2cache.c b/sys/arm/ti/omap4/omap4_l2cache.c
index 35ffe1aee293..65498c86951d 100644
--- a/sys/arm/ti/omap4/omap4_l2cache.c
+++ b/sys/arm/ti/omap4/omap4_l2cache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
diff --git a/sys/arm/ti/omap4/omap4_mp.c b/sys/arm/ti/omap4/omap4_mp.c
index ca4a9258ec27..9a12c337dac2 100644
--- a/sys/arm/ti/omap4/omap4_mp.c
+++ b/sys/arm/ti/omap4/omap4_mp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
diff --git a/sys/arm/ti/omap4/omap4_reg.h b/sys/arm/ti/omap4/omap4_reg.h
index d95eb68d393c..6748b5b9bee1 100644
--- a/sys/arm/ti/omap4/omap4_reg.h
+++ b/sys/arm/ti/omap4/omap4_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/omap4/omap4_smc.h b/sys/arm/ti/omap4/omap4_smc.h
index cb22f10440fa..e287882e6f6d 100644
--- a/sys/arm/ti/omap4/omap4_smc.h
+++ b/sys/arm/ti/omap4/omap4_smc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
diff --git a/sys/arm/ti/ti_cpuid.c b/sys/arm/ti/ti_cpuid.c
index b965f99943f9..69ad05e31369 100644
--- a/sys/arm/ti/ti_cpuid.c
+++ b/sys/arm/ti/ti_cpuid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_cpuid.h b/sys/arm/ti/ti_cpuid.h
index fd84599ea7cd..1518a7403ddd 100644
--- a/sys/arm/ti/ti_cpuid.h
+++ b/sys/arm/ti/ti_cpuid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_edma3.h b/sys/arm/ti/ti_edma3.h
index 501b70a643e8..e8210793aaae 100644
--- a/sys/arm/ti/ti_edma3.h
+++ b/sys/arm/ti/ti_edma3.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/ti_gpio.c b/sys/arm/ti/ti_gpio.c
index 0c0330b3190c..eea754318bff 100644
--- a/sys/arm/ti/ti_gpio.c
+++ b/sys/arm/ti/ti_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>.
* Copyright (c) 2014 Luiz Otavio O Souza <loos@FreeBSD.org>.
diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c
index c9b27436547c..8196faa63182 100644
--- a/sys/arm/ti/ti_i2c.c
+++ b/sys/arm/ti/ti_i2c.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>.
* Copyright (c) 2014 Luiz Otavio O Souza <loos@freebsd.org>.
diff --git a/sys/arm/ti/ti_i2c.h b/sys/arm/ti/ti_i2c.h
index 835fa58d6951..61b959ff2fed 100644
--- a/sys/arm/ti/ti_i2c.h
+++ b/sys/arm/ti/ti_i2c.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_mbox.c b/sys/arm/ti/ti_mbox.c
index abd3e5ad25ac..ebedac6edf61 100644
--- a/sys/arm/ti/ti_mbox.c
+++ b/sys/arm/ti/ti_mbox.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/ti/ti_mbox.h b/sys/arm/ti/ti_mbox.h
index 31f82a3ce7b1..29cce879db28 100644
--- a/sys/arm/ti/ti_mbox.h
+++ b/sys/arm/ti/ti_mbox.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm/ti/ti_omap4_cm.c b/sys/arm/ti/ti_omap4_cm.c
index 795bd2b75206..5b4cf46dce54 100644
--- a/sys/arm/ti/ti_omap4_cm.c
+++ b/sys/arm/ti/ti_omap4_cm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.org>
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
diff --git a/sys/arm/ti/ti_omap4_cm.h b/sys/arm/ti/ti_omap4_cm.h
index 4da56520cc97..a508fbc9fc9e 100644
--- a/sys/arm/ti/ti_omap4_cm.h
+++ b/sys/arm/ti/ti_omap4_cm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/ti_prcm.c b/sys/arm/ti/ti_prcm.c
index 2664b8f71ec4..0dd50f2c74d2 100644
--- a/sys/arm/ti/ti_prcm.c
+++ b/sys/arm/ti/ti_prcm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org>
* All rights reserved.
diff --git a/sys/arm/ti/ti_prcm.h b/sys/arm/ti/ti_prcm.h
index 98f8abc15dd7..2d953ae90e7b 100644
--- a/sys/arm/ti/ti_prcm.h
+++ b/sys/arm/ti/ti_prcm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/ti_prm.h b/sys/arm/ti/ti_prm.h
index bc3e991088f0..3e9f85f1fe4a 100644
--- a/sys/arm/ti/ti_prm.h
+++ b/sys/arm/ti/ti_prm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
index a8dc15ab80b0..11be5d3d01ce 100644
--- a/sys/arm/ti/ti_pruss.c
+++ b/sys/arm/ti/ti_pruss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2017 Manuel Stuehn
diff --git a/sys/arm/ti/ti_pruss.h b/sys/arm/ti/ti_pruss.h
index 855ac2d69790..df4f4ffd5b94 100644
--- a/sys/arm/ti/ti_pruss.h
+++ b/sys/arm/ti/ti_pruss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2017 Manuel Stuehn
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 8554a562ad84..ed46d141d190 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2011 Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_sdma.c b/sys/arm/ti/ti_sdma.c
index 9da33d47df82..ef72d8c99f13 100644
--- a/sys/arm/ti/ti_sdma.c
+++ b/sys/arm/ti/ti_sdma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_sdma.h b/sys/arm/ti/ti_sdma.h
index 5b96766b2fb1..affdc64b5f86 100644
--- a/sys/arm/ti/ti_sdma.h
+++ b/sys/arm/ti/ti_sdma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_sdmareg.h b/sys/arm/ti/ti_sdmareg.h
index 8fa8d7ba02d4..84dcc96f8de3 100644
--- a/sys/arm/ti/ti_sdmareg.h
+++ b/sys/arm/ti/ti_sdmareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/ti_smc.h b/sys/arm/ti/ti_smc.h
index 8db0333fc2fb..83241d0202b2 100644
--- a/sys/arm/ti/ti_smc.h
+++ b/sys/arm/ti/ti_smc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Olivier Houchard. All rights reserved.
*
diff --git a/sys/arm/ti/ti_sysc.h b/sys/arm/ti/ti_sysc.h
index b74222f05772..e551feea0033 100644
--- a/sys/arm/ti/ti_sysc.h
+++ b/sys/arm/ti/ti_sysc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oskar Holmlund <oskar.holmlund@ohdata.se>
*
diff --git a/sys/arm/ti/twl/twl.c b/sys/arm/ti/twl/twl.c
index c7755b524f0a..52eb06002574 100644
--- a/sys/arm/ti/twl/twl.c
+++ b/sys/arm/ti/twl/twl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/twl/twl.h b/sys/arm/ti/twl/twl.h
index 44203a765623..93d4e0549423 100644
--- a/sys/arm/ti/twl/twl.h
+++ b/sys/arm/ti/twl/twl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/twl/twl_clks.c b/sys/arm/ti/twl/twl_clks.c
index fee2f2226a32..ad0d49266162 100644
--- a/sys/arm/ti/twl/twl_clks.c
+++ b/sys/arm/ti/twl/twl_clks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
diff --git a/sys/arm/ti/twl/twl_clks.h b/sys/arm/ti/twl/twl_clks.h
index 85aeb4368e4f..2d71a1a5bbd1 100644
--- a/sys/arm/ti/twl/twl_clks.h
+++ b/sys/arm/ti/twl/twl_clks.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
diff --git a/sys/arm/ti/twl/twl_vreg.c b/sys/arm/ti/twl/twl_vreg.c
index 6d78f053624b..609fa2275184 100644
--- a/sys/arm/ti/twl/twl_vreg.c
+++ b/sys/arm/ti/twl/twl_vreg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/twl/twl_vreg.h b/sys/arm/ti/twl/twl_vreg.h
index ee7165fce920..56b94f77f107 100644
--- a/sys/arm/ti/twl/twl_vreg.h
+++ b/sys/arm/ti/twl/twl_vreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/ti/usb/omap_ehci.c b/sys/arm/ti/usb/omap_ehci.c
index 8b1bb700bf43..0ef9f6fc75a2 100644
--- a/sys/arm/ti/usb/omap_ehci.c
+++ b/sys/arm/ti/usb/omap_ehci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
diff --git a/sys/arm/versatile/pl050.c b/sys/arm/versatile/pl050.c
index cccb4a947c6e..9c0e000e5e06 100644
--- a/sys/arm/versatile/pl050.c
+++ b/sys/arm/versatile/pl050.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/versatile/sp804.c b/sys/arm/versatile/sp804.c
index e45541b0abe5..a4f8cc4e7b32 100644
--- a/sys/arm/versatile/sp804.c
+++ b/sys/arm/versatile/sp804.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Damjan Marion <dmarion@freebsd.org>
diff --git a/sys/arm/versatile/versatile_clcd.c b/sys/arm/versatile/versatile_clcd.c
index 81a0dbcc5256..33793c931c41 100644
--- a/sys/arm/versatile/versatile_clcd.c
+++ b/sys/arm/versatile/versatile_clcd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2017 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/versatile/versatile_pci.c b/sys/arm/versatile/versatile_pci.c
index 73e047180063..67b21ea41566 100644
--- a/sys/arm/versatile/versatile_pci.c
+++ b/sys/arm/versatile/versatile_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2017 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/versatile/versatile_sic.c b/sys/arm/versatile/versatile_sic.c
index f3a35ce68a26..d8df28d3d51c 100644
--- a/sys/arm/versatile/versatile_sic.c
+++ b/sys/arm/versatile/versatile_sic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2017 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c
index d9a01a6e7f73..91a2df66743d 100644
--- a/sys/arm/xilinx/uart_dev_cdnc.c
+++ b/sys/arm/xilinx/uart_dev_cdnc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Olivier Houchard All rights reserved.
* Copyright (c) 2012 Thomas Skibo All rights reserved.
diff --git a/sys/arm/xilinx/zy7_devcfg.c b/sys/arm/xilinx/zy7_devcfg.c
index d10cf1e31c23..67eea5550780 100644
--- a/sys/arm/xilinx/zy7_devcfg.c
+++ b/sys/arm/xilinx/zy7_devcfg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_ehci.c b/sys/arm/xilinx/zy7_ehci.c
index 28e4705599c7..07d72a661ff1 100644
--- a/sys/arm/xilinx/zy7_ehci.c
+++ b/sys/arm/xilinx/zy7_ehci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c
index 3e31805f19fe..5d2f40718515 100644
--- a/sys/arm/xilinx/zy7_gpio.c
+++ b/sys/arm/xilinx/zy7_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_l2cache.c b/sys/arm/xilinx/zy7_l2cache.c
index 4711bb8d38ec..c74554e51049 100644
--- a/sys/arm/xilinx/zy7_l2cache.c
+++ b/sys/arm/xilinx/zy7_l2cache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_machdep.c b/sys/arm/xilinx/zy7_machdep.c
index ddab208e80d1..103c97b30ea8 100644
--- a/sys/arm/xilinx/zy7_machdep.c
+++ b/sys/arm/xilinx/zy7_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c
index e94c93db1e36..8fb9bf9b2491 100644
--- a/sys/arm/xilinx/zy7_qspi.c
+++ b/sys/arm/xilinx/zy7_qspi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Thomas Skibo <thomasskibo@yahoo.com>
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_reg.h b/sys/arm/xilinx/zy7_reg.h
index 855fa0df16d1..15b5c545e234 100644
--- a/sys/arm/xilinx/zy7_reg.h
+++ b/sys/arm/xilinx/zy7_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c
index 6651252151e2..7a072f1054ea 100644
--- a/sys/arm/xilinx/zy7_slcr.c
+++ b/sys/arm/xilinx/zy7_slcr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm/xilinx/zy7_slcr.h b/sys/arm/xilinx/zy7_slcr.h
index d6ca043a9258..a12be680a215 100644
--- a/sys/arm/xilinx/zy7_slcr.h
+++ b/sys/arm/xilinx/zy7_slcr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/arm64/acpica/acpi_iort.c b/sys/arm64/acpica/acpi_iort.c
index e35531731251..17d4c27fdb2d 100644
--- a/sys/arm64/acpica/acpi_iort.c
+++ b/sys/arm64/acpica/acpi_iort.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Marvell International Ltd.
*
diff --git a/sys/arm64/arm64/gdb_machdep.c b/sys/arm64/arm64/gdb_machdep.c
index b27e1edb3d7f..0673f591ef98 100644
--- a/sys/arm64/arm64/gdb_machdep.c
+++ b/sys/arm64/arm64/gdb_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 The FreeBSD Foundation
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_composite.c b/sys/arm64/freescale/imx/clk/imx_clk_composite.c
index 982ca2c6332f..6c83c0993c83 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_composite.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_composite.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_composite.h b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
index 56f8e707d92d..bb016f51c0ee 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_composite.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_composite.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
index 9742b691f73e..0ae303a05578 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
index e80a34d113fc..02f696649663 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_gate.c b/sys/arm64/freescale/imx/clk/imx_clk_gate.c
index 2ec9f39279a0..4ff148d5fd0d 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_gate.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_gate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_gate.h b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
index 3eaf3d51da23..bd3fd320ba07 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_gate.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_gate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_mux.c b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
index 8cb6b19daa1c..48116683c7ce 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_mux.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_mux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_mux.h b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
index e3e32c12a939..65f4903d6688 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_mux.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_mux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
index 2b1532e1498e..f403d183dd8f 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
+++ b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
index eb0d3e9efbec..522138c4c055 100644
--- a/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
+++ b/sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/imx7gpc.c b/sys/arm64/freescale/imx/imx7gpc.c
index baad16452982..0812ee69a02a 100644
--- a/sys/arm64/freescale/imx/imx7gpc.c
+++ b/sys/arm64/freescale/imx/imx7gpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/imx8mq_ccm.c b/sys/arm64/freescale/imx/imx8mq_ccm.c
index 5c9751791415..13e80698f5b5 100644
--- a/sys/arm64/freescale/imx/imx8mq_ccm.c
+++ b/sys/arm64/freescale/imx/imx8mq_ccm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/imx8mq_ccm.h b/sys/arm64/freescale/imx/imx8mq_ccm.h
index dcd016fc729f..ab3857e7c56d 100644
--- a/sys/arm64/freescale/imx/imx8mq_ccm.h
+++ b/sys/arm64/freescale/imx/imx8mq_ccm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/freescale/imx/imx_ccm_clk.h b/sys/arm64/freescale/imx/imx_ccm_clk.h
index 6f17c389bad3..0d8611fd7777 100644
--- a/sys/arm64/freescale/imx/imx_ccm_clk.h
+++ b/sys/arm64/freescale/imx/imx_ccm_clk.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/include/gdb_machdep.h b/sys/arm64/include/gdb_machdep.h
index 17b46edd1a27..5813a29511c6 100644
--- a/sys/arm64/include/gdb_machdep.h
+++ b/sys/arm64/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 The FreeBSD Foundation
*
diff --git a/sys/arm64/include/pcpu_aux.h b/sys/arm64/include/pcpu_aux.h
index 382811dfa1fb..57637c50063a 100644
--- a/sys/arm64/include/pcpu_aux.h
+++ b/sys/arm64/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c
index 571b9f0b2a4f..c49403ad1584 100644
--- a/sys/arm64/linux/linux_dummy_machdep.c
+++ b/sys/arm64/linux/linux_dummy_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/arm64/linux/linux_locore.asm b/sys/arm64/linux/linux_locore.asm
index dfaafba155f2..417cc7bd5fc4 100644
--- a/sys/arm64/linux/linux_locore.asm
+++ b/sys/arm64/linux/linux_locore.asm
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Turing Robotic Industries Inc.
* Copyright (C) 2020 Andrew Turner <andrew@FreeBSD.org>
diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c
index 87014950497e..8a7593ba94ba 100644
--- a/sys/arm64/linux/linux_machdep.c
+++ b/sys/arm64/linux/linux_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Turing Robotic Industries Inc.
* Copyright (c) 2000 Marcel Moolenaar
diff --git a/sys/arm64/linux/linux_support.s b/sys/arm64/linux/linux_support.s
index 933930b5096f..fb9af15ebb13 100644
--- a/sys/arm64/linux/linux_support.s
+++ b/sys/arm64/linux/linux_support.s
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Turing Robotic Industries Inc.
* Copyright (C) 2022 Dmitry Chagin <dchagin@FreeBSD.org>
diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
index 709566ee15bc..be3071db76c4 100644
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* Copyright (c) 2018 Turing Robotic Industries Inc.
diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c
index ff6fe56adbdf..0c7502d7846d 100644
--- a/sys/arm64/linux/linux_vdso_gtod.c
+++ b/sys/arm64/linux/linux_vdso_gtod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org>
diff --git a/sys/arm64/nvidia/tegra210/max77620.h b/sys/arm64/nvidia/tegra210/max77620.h
index 32d486add2b8..d0a418332c21 100644
--- a/sys/arm64/nvidia/tegra210/max77620.h
+++ b/sys/arm64/nvidia/tegra210/max77620.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/max77620_gpio.c b/sys/arm64/nvidia/tegra210/max77620_gpio.c
index 2e9156801d97..aa923d69a1fc 100644
--- a/sys/arm64/nvidia/tegra210/max77620_gpio.c
+++ b/sys/arm64/nvidia/tegra210/max77620_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/max77620_regulators.c b/sys/arm64/nvidia/tegra210/max77620_regulators.c
index beb34405a90e..0d9df541b739 100644
--- a/sys/arm64/nvidia/tegra210/max77620_regulators.c
+++ b/sys/arm64/nvidia/tegra210/max77620_regulators.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/max77620_rtc.c b/sys/arm64/nvidia/tegra210/max77620_rtc.c
index 09da17ad7d8f..45917675e233 100644
--- a/sys/arm64/nvidia/tegra210/max77620_rtc.c
+++ b/sys/arm64/nvidia/tegra210/max77620_rtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_car.c b/sys/arm64/nvidia/tegra210/tegra210_car.c
index 149fb7864def..246f5a400df3 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_car.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_car.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_car.h b/sys/arm64/nvidia/tegra210/tegra210_car.h
index bfbe09e87933..c4dd8f65c5e7 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_car.h
+++ b/sys/arm64/nvidia/tegra210/tegra210_car.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_per.c b/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
index edf842e1afac..a8d052e6c341 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_per.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c b/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
index 64e3f6623d29..68fd694bb58a 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_pll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_clk_super.c b/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
index 2c35ab53a9df..909aa0474036 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_clk_super.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
index 0b637954eceb..7a31cbe685df 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
index 4519dc3ca9d6..ebadf99fe6fd 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pinmux.c b/sys/arm64/nvidia/tegra210/tegra210_pinmux.c
index 9f4f05368026..a78754c8e582 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_pinmux.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pinmux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pmc.c b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
index 5ffa8cb97512..4d857a83909a 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
index 4ecbceb98049..3c551b8c18ec 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/qoriq/clk/ls1046a_clkgen.c b/sys/arm64/qoriq/clk/ls1046a_clkgen.c
index 3270201f4f3d..f84ca4d1934b 100644
--- a/sys/arm64/qoriq/clk/ls1046a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1046a_clkgen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/arm64/qoriq/clk/ls1088a_clkgen.c b/sys/arm64/qoriq/clk/ls1088a_clkgen.c
index 06e893504c35..62f4fd7df5df 100644
--- a/sys/arm64/qoriq/clk/ls1088a_clkgen.c
+++ b/sys/arm64/qoriq/clk/ls1088a_clkgen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Alstom Group.
* Copyright (c) 2021 Semihalf.
diff --git a/sys/arm64/qoriq/clk/lx2160a_clkgen.c b/sys/arm64/qoriq/clk/lx2160a_clkgen.c
index 2fb7b3f283ae..c9eff97f18b6 100644
--- a/sys/arm64/qoriq/clk/lx2160a_clkgen.c
+++ b/sys/arm64/qoriq/clk/lx2160a_clkgen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/qoriq/clk/qoriq_clk_pll.c b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
index e7127387ceff..0bfc66a187c1 100644
--- a/sys/arm64/qoriq/clk/qoriq_clk_pll.c
+++ b/sys/arm64/qoriq/clk/qoriq_clk_pll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/arm64/qoriq/clk/qoriq_clk_pll.h b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
index c9600f19e205..dd880cb19f76 100644
--- a/sys/arm64/qoriq/clk/qoriq_clk_pll.h
+++ b/sys/arm64/qoriq/clk/qoriq_clk_pll.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/arm64/qoriq/clk/qoriq_clkgen.c b/sys/arm64/qoriq/clk/qoriq_clkgen.c
index 6b67842bc9b7..99b806c7676f 100644
--- a/sys/arm64/qoriq/clk/qoriq_clkgen.c
+++ b/sys/arm64/qoriq/clk/qoriq_clkgen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/arm64/qoriq/clk/qoriq_clkgen.h b/sys/arm64/qoriq/clk/qoriq_clkgen.h
index b08b5d23bebb..802cf1f42e8a 100644
--- a/sys/arm64/qoriq/clk/qoriq_clkgen.h
+++ b/sys/arm64/qoriq/clk/qoriq_clkgen.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/arm64/qoriq/ls1046_gpio.c b/sys/arm64/qoriq/ls1046_gpio.c
index 4992d059a0ee..eb6231bd2f4f 100644
--- a/sys/arm64/qoriq/ls1046_gpio.c
+++ b/sys/arm64/qoriq/ls1046_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c
index d052c9910a47..7a4c35e32a1b 100644
--- a/sys/arm64/qoriq/qoriq_dw_pci.c
+++ b/sys/arm64/qoriq/qoriq_dw_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/qoriq/qoriq_therm.c b/sys/arm64/qoriq/qoriq_therm.c
index c5a79fa3287b..401700e82ca5 100644
--- a/sys/arm64/qoriq/qoriq_therm.c
+++ b/sys/arm64/qoriq/qoriq_therm.c
@@ -1,6 +1,6 @@
/*-
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/qoriq/qoriq_therm_if.m b/sys/arm64/qoriq/qoriq_therm_if.m
index ad2d292de783..e7145e078a17 100644
--- a/sys/arm64/qoriq/qoriq_therm_if.m
+++ b/sys/arm64/qoriq/qoriq_therm_if.m
@@ -1,6 +1,6 @@
#-
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2020 Michal Meloun <mmel@FreeBSD.org>
#
diff --git a/sys/arm64/rockchip/clk/rk3288_cru.c b/sys/arm64/rockchip/clk/rk3288_cru.c
index 3f4a59864545..55e627996e0f 100644
--- a/sys/arm64/rockchip/clk/rk3288_cru.c
+++ b/sys/arm64/rockchip/clk/rk3288_cru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
* All rights reserved.
diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c
index 63c8797f6b44..8fffc191b444 100644
--- a/sys/arm64/rockchip/clk/rk3328_cru.c
+++ b/sys/arm64/rockchip/clk/rk3328_cru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018-2021 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/clk/rk3399_cru.c b/sys/arm64/rockchip/clk/rk3399_cru.c
index 595085862e13..8faf8680bb52 100644
--- a/sys/arm64/rockchip/clk/rk3399_cru.c
+++ b/sys/arm64/rockchip/clk/rk3399_cru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
* Copyright (c) 2018 Greg V <greg@unrelenting.technology>
diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c
index 3327117b98a1..c28afed57f9f 100644
--- a/sys/arm64/rockchip/clk/rk3399_pmucru.c
+++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
* Copyright (c) 2018 Greg V <greg@unrelenting.technology>
diff --git a/sys/arm64/rockchip/clk/rk_clk_armclk.c b/sys/arm64/rockchip/clk/rk_clk_armclk.c
index 548539541fde..7e0997ce3655 100644
--- a/sys/arm64/rockchip/clk/rk_clk_armclk.c
+++ b/sys/arm64/rockchip/clk/rk_clk_armclk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_armclk.h b/sys/arm64/rockchip/clk/rk_clk_armclk.h
index 355f5031574b..01c7a778ef7c 100644
--- a/sys/arm64/rockchip/clk/rk_clk_armclk.h
+++ b/sys/arm64/rockchip/clk/rk_clk_armclk.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/arm64/rockchip/clk/rk_clk_composite.c
index 17d258e02985..e603ce5585d6 100644
--- a/sys/arm64/rockchip/clk/rk_clk_composite.c
+++ b/sys/arm64/rockchip/clk/rk_clk_composite.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.h b/sys/arm64/rockchip/clk/rk_clk_composite.h
index 3f221572bcb9..d1ecd3f49b9d 100644
--- a/sys/arm64/rockchip/clk/rk_clk_composite.h
+++ b/sys/arm64/rockchip/clk/rk_clk_composite.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_fract.c b/sys/arm64/rockchip/clk/rk_clk_fract.c
index 2b347db91790..0b221da704e2 100644
--- a/sys/arm64/rockchip/clk/rk_clk_fract.c
+++ b/sys/arm64/rockchip/clk/rk_clk_fract.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_fract.h b/sys/arm64/rockchip/clk/rk_clk_fract.h
index 03fab3fd2884..1fd1f5134a03 100644
--- a/sys/arm64/rockchip/clk/rk_clk_fract.h
+++ b/sys/arm64/rockchip/clk/rk_clk_fract.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_gate.c b/sys/arm64/rockchip/clk/rk_clk_gate.c
index 363d21c05372..a0c071664613 100644
--- a/sys/arm64/rockchip/clk/rk_clk_gate.c
+++ b/sys/arm64/rockchip/clk/rk_clk_gate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/rockchip/clk/rk_clk_gate.h b/sys/arm64/rockchip/clk/rk_clk_gate.h
index c90993899b6e..2172d010f521 100644
--- a/sys/arm64/rockchip/clk/rk_clk_gate.h
+++ b/sys/arm64/rockchip/clk/rk_clk_gate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_mux.c b/sys/arm64/rockchip/clk/rk_clk_mux.c
index 20e612b8c764..3ba5fcd84fea 100644
--- a/sys/arm64/rockchip/clk/rk_clk_mux.c
+++ b/sys/arm64/rockchip/clk/rk_clk_mux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/rockchip/clk/rk_clk_mux.h b/sys/arm64/rockchip/clk/rk_clk_mux.h
index c2b5f9cdad69..56edd2df0cbc 100644
--- a/sys/arm64/rockchip/clk/rk_clk_mux.h
+++ b/sys/arm64/rockchip/clk/rk_clk_mux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/rockchip/clk/rk_clk_pll.c b/sys/arm64/rockchip/clk/rk_clk_pll.c
index 99026c546727..d09dad82f187 100644
--- a/sys/arm64/rockchip/clk/rk_clk_pll.c
+++ b/sys/arm64/rockchip/clk/rk_clk_pll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_clk_pll.h b/sys/arm64/rockchip/clk/rk_clk_pll.h
index 71a1f2d35be9..69dd623351a1 100644
--- a/sys/arm64/rockchip/clk/rk_clk_pll.h
+++ b/sys/arm64/rockchip/clk/rk_clk_pll.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_cru.c b/sys/arm64/rockchip/clk/rk_cru.c
index 70106c589670..3d63a356e648 100644
--- a/sys/arm64/rockchip/clk/rk_cru.c
+++ b/sys/arm64/rockchip/clk/rk_cru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h
index fc838fc11d19..a325454ad841 100644
--- a/sys/arm64/rockchip/clk/rk_cru.h
+++ b/sys/arm64/rockchip/clk/rk_cru.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/if_dwc_rk.c b/sys/arm64/rockchip/if_dwc_rk.c
index eafd9e00caf0..f7976696c125 100644
--- a/sys/arm64/rockchip/if_dwc_rk.c
+++ b/sys/arm64/rockchip/if_dwc_rk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/arm64/rockchip/rk3399_emmcphy.c b/sys/arm64/rockchip/rk3399_emmcphy.c
index 533ccb0b2c8f..5380a165961a 100644
--- a/sys/arm64/rockchip/rk3399_emmcphy.c
+++ b/sys/arm64/rockchip/rk3399_emmcphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
* All rights reserved.
diff --git a/sys/arm64/rockchip/rk805.c b/sys/arm64/rockchip/rk805.c
index 39755fa5ce87..53df9026ba59 100644
--- a/sys/arm64/rockchip/rk805.c
+++ b/sys/arm64/rockchip/rk805.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk805reg.h b/sys/arm64/rockchip/rk805reg.h
index 61c6f49abd2c..22bb827df3d1 100644
--- a/sys/arm64/rockchip/rk805reg.h
+++ b/sys/arm64/rockchip/rk805reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_dwc3.c b/sys/arm64/rockchip/rk_dwc3.c
index 72292e9f8902..b7babb7d907f 100644
--- a/sys/arm64/rockchip/rk_dwc3.c
+++ b/sys/arm64/rockchip/rk_dwc3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.Org>
*
diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c
index 564059fe5d23..804c9de9aaaf 100644
--- a/sys/arm64/rockchip/rk_gpio.c
+++ b/sys/arm64/rockchip/rk_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_grf.c b/sys/arm64/rockchip/rk_grf.c
index d55bdd04e861..5a0a965e9b01 100644
--- a/sys/arm64/rockchip/rk_grf.c
+++ b/sys/arm64/rockchip/rk_grf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c
index ffe6f17ee0ac..8f10452030a4 100644
--- a/sys/arm64/rockchip/rk_i2c.c
+++ b/sys/arm64/rockchip/rk_i2c.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c
index df773012fe4e..c5d6b8c95dc8 100644
--- a/sys/arm64/rockchip/rk_iodomain.c
+++ b/sys/arm64/rockchip/rk_iodomain.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c
index 42ea0e066bf5..e5af60f1b00c 100644
--- a/sys/arm64/rockchip/rk_pcie.c
+++ b/sys/arm64/rockchip/rk_pcie.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c
index 816bb26a9e16..b3e741314e7c 100644
--- a/sys/arm64/rockchip/rk_pcie_phy.c
+++ b/sys/arm64/rockchip/rk_pcie_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c
index 5b62f67201d0..34225ac6121c 100644
--- a/sys/arm64/rockchip/rk_pinctrl.c
+++ b/sys/arm64/rockchip/rk_pinctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_pmu.c b/sys/arm64/rockchip/rk_pmu.c
index fcd1242f8c6f..6a479ab79bdb 100644
--- a/sys/arm64/rockchip/rk_pmu.c
+++ b/sys/arm64/rockchip/rk_pmu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_pwm.c b/sys/arm64/rockchip/rk_pwm.c
index f7f2cd8cbeef..185f35419e24 100644
--- a/sys/arm64/rockchip/rk_pwm.c
+++ b/sys/arm64/rockchip/rk_pwm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
* Copyright (c) 2019 Brandon Bergren <git@bdragon.rtk0.net>
diff --git a/sys/arm64/rockchip/rk_spi.c b/sys/arm64/rockchip/rk_spi.c
index a5f0d93263d8..40d19ae191e2 100644
--- a/sys/arm64/rockchip/rk_spi.c
+++ b/sys/arm64/rockchip/rk_spi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c
index 344ac6bc7d5e..c4756ce88b84 100644
--- a/sys/arm64/rockchip/rk_tsadc.c
+++ b/sys/arm64/rockchip/rk_tsadc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/arm64/rockchip/rk_tsadc_if.m b/sys/arm64/rockchip/rk_tsadc_if.m
index 890448f4d7a0..58a3fefe3c56 100644
--- a/sys/arm64/rockchip/rk_tsadc_if.m
+++ b/sys/arm64/rockchip/rk_tsadc_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
#
diff --git a/sys/arm64/rockchip/rk_typec_phy.c b/sys/arm64/rockchip/rk_typec_phy.c
index 35e677e3bfee..71ebd395407e 100644
--- a/sys/arm64/rockchip/rk_typec_phy.c
+++ b/sys/arm64/rockchip/rk_typec_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.Org>
*
diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c
index 72315f1475ab..50d289f2ab26 100644
--- a/sys/arm64/rockchip/rk_usb2phy.c
+++ b/sys/arm64/rockchip/rk_usb2phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.Org>
*
diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c
index 59c4bd0ce02f..c5115eedaa33 100644
--- a/sys/arm64/rockchip/rk_usbphy.c
+++ b/sys/arm64/rockchip/rk_usbphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c
index 0e20e4b11544..4e95a8f1568c 100644
--- a/sys/cam/ata/ata_all.c
+++ b/sys/cam/ata/ata_all.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ata/ata_all.h b/sys/cam/ata/ata_all.h
index ca635253511c..a8fab2c2c4c7 100644
--- a/sys/cam/ata/ata_all.h
+++ b/sys/cam/ata/ata_all.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 2a4fc7cc1784..0be3d1816022 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c
index 153d8e187d7a..2e6126d5f559 100644
--- a/sys/cam/ata/ata_pmp.c
+++ b/sys/cam/ata/ata_pmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index a3be7470354f..f43ab0aa442c 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index 5b7235e01314..ae1286c8bc6a 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -1,7 +1,7 @@
/*-
* Generic utility routines for the Common Access Method layer.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index cb26d06723f5..c83f30866ce4 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -1,7 +1,7 @@
/*-
* Data structures and definitions for the CAM system.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index a0066eae3361..e195efd44c8e 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -1,7 +1,7 @@
/*-
* Data structures and definitions for CAM Control Blocks (CCBs).
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_compat.c b/sys/cam/cam_compat.c
index 6893402a3d9c..b061a3de24bb 100644
--- a/sys/cam/cam_compat.c
+++ b/sys/cam/cam_compat.c
@@ -1,7 +1,7 @@
/*-
* CAM ioctl compatibility shims
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Scott Long
* All rights reserved.
diff --git a/sys/cam/cam_compat.h b/sys/cam/cam_compat.h
index 9a1996d230ce..821ef18eaae5 100644
--- a/sys/cam/cam_compat.h
+++ b/sys/cam/cam_compat.h
@@ -1,7 +1,7 @@
/*-
* CAM ioctl compatibility shims
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Scott Long
* All rights reserved.
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index fcea93401632..39db02d8b8c2 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -1,7 +1,7 @@
/*-
* Macros for tracing/loging information in the CAM layer
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c
index 59feb68898d4..f59d10661df7 100644
--- a/sys/cam/cam_iosched.c
+++ b/sys/cam/cam_iosched.c
@@ -1,7 +1,7 @@
/*-
* CAM IO Scheduler Interface
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Netflix, Inc.
*
diff --git a/sys/cam/cam_iosched.h b/sys/cam/cam_iosched.h
index 49909351a45a..6b7f8783ba00 100644
--- a/sys/cam/cam_iosched.h
+++ b/sys/cam/cam_iosched.h
@@ -1,7 +1,7 @@
/*-
* CAM IO Scheduler Interface
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Netflix, Inc.
*
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index e7fbc8c41c0a..daa449458a82 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -1,7 +1,7 @@
/*-
* Common functions for CAM "type" (peripheral) drivers.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999, 2000 Kenneth D. Merry.
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index eb8dea2c5599..1b586bda6124 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -1,7 +1,7 @@
/*-
* Data structures and definitions for CAM peripheral ("type") drivers.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index d42685057791..733d8e9fb6b5 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -1,7 +1,7 @@
/*-
* CAM request queue management functions.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index e5928027f030..2276399fb1d8 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -1,7 +1,7 @@
/*-
* CAM request queue management definitions.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index e82332b999c3..6c1ee7498ceb 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -1,7 +1,7 @@
/*-
* Common functions for SCSI Interface Modules (SIMs).
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index a1595a51fadb..66d11ae428d1 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -1,7 +1,7 @@
/*-
* Data structures and definitions for SCSI Interface Modules (SIMs).
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 184a6b69b488..6fb94a683601 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -1,7 +1,7 @@
/*-
* Implementation of the Common Access Method Transport (XPT) layer.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 1d3fd9d315a1..8d2e4914468a 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -2,7 +2,7 @@
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_xpt_internal.h b/sys/cam/cam_xpt_internal.h
index 18c8fc85b765..4c8dc4cf5b4f 100644
--- a/sys/cam/cam_xpt_internal.h
+++ b/sys/cam/cam_xpt_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2009 Scott Long
* All rights reserved.
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index 15d98cc81d1f..4b12f3fbab06 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -3,7 +3,7 @@
* Common Access Method Transport (xpt) layer from peripheral
* drivers.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index aa9746019981..0e63b4ccf980 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -2,7 +2,7 @@
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 097a5942650e..e648c557509e 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index be3e4a37b157..e097ee2d2482 100644
--- a/sys/cam/ctl/ctl.h
+++ b/sys/cam/ctl/ctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_backend.c b/sys/cam/ctl/ctl_backend.c
index b7f154f6bfad..40dbf7019289 100644
--- a/sys/cam/ctl/ctl_backend.c
+++ b/sys/cam/ctl/ctl_backend.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_backend.h b/sys/cam/ctl/ctl_backend.h
index fe4e7f5df1d0..bfcb6343c2f2 100644
--- a/sys/cam/ctl/ctl_backend.h
+++ b/sys/cam/ctl/ctl_backend.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index ac23a6ce2bc9..7b7b64fd2cd7 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2009-2011 Spectra Logic Corporation
diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c
index 9ddee1814aa1..56b203f1b0fc 100644
--- a/sys/cam/ctl/ctl_backend_ramdisk.c
+++ b/sys/cam/ctl/ctl_backend_ramdisk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2008 Silicon Graphics International Corp.
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c
index 2e512ec11c82..0e4be105fd25 100644
--- a/sys/cam/ctl/ctl_cmd_table.c
+++ b/sys/cam/ctl/ctl_cmd_table.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004, 2005, 2009 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_debug.h b/sys/cam/ctl/ctl_debug.h
index fcc5993888e8..2c1113bcdb8e 100644
--- a/sys/cam/ctl/ctl_debug.h
+++ b/sys/cam/ctl/ctl_debug.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c
index dae4deb9e5e7..6ab7f2f76ec7 100644
--- a/sys/cam/ctl/ctl_error.c
+++ b/sys/cam/ctl/ctl_error.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2011 Spectra Logic Corporation
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h
index eb9e1fc5d1a0..cec434e2cf0a 100644
--- a/sys/cam/ctl/ctl_error.h
+++ b/sys/cam/ctl/ctl_error.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c
index d481c1b8f003..496947e27563 100644
--- a/sys/cam/ctl/ctl_frontend.c
+++ b/sys/cam/ctl/ctl_frontend.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_frontend.h b/sys/cam/ctl/ctl_frontend.h
index c9ab255cdde4..c0a929bbaea3 100644
--- a/sys/cam/ctl/ctl_frontend.h
+++ b/sys/cam/ctl/ctl_frontend.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_frontend_cam_sim.c b/sys/cam/ctl/ctl_frontend_cam_sim.c
index 0e61a80e452c..262294148f61 100644
--- a/sys/cam/ctl/ctl_frontend_cam_sim.c
+++ b/sys/cam/ctl/ctl_frontend_cam_sim.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c
index f53dae694867..1a532fdbef72 100644
--- a/sys/cam/ctl/ctl_frontend_ioctl.c
+++ b/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 102156b5841e..6f165a3b8d8c 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.h b/sys/cam/ctl/ctl_frontend_iscsi.h
index 165f0ad79d70..072162806408 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.h
+++ b/sys/cam/ctl/ctl_frontend_iscsi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c
index e2ecb9706f56..5007fcb043ed 100644
--- a/sys/cam/ctl/ctl_ha.c
+++ b/sys/cam/ctl/ctl_ha.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_ha.h b/sys/cam/ctl/ctl_ha.h
index 98f284d5c59d..ac182d6e0fc0 100644
--- a/sys/cam/ctl/ctl_ha.h
+++ b/sys/cam/ctl/ctl_ha.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2011 Spectra Logic Corporation
diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h
index de312608da8e..d3c97c7e0047 100644
--- a/sys/cam/ctl/ctl_io.h
+++ b/sys/cam/ctl/ctl_io.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h
index 543f97a65d30..8453acb900de 100644
--- a/sys/cam/ctl/ctl_ioctl.h
+++ b/sys/cam/ctl/ctl_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2011 Spectra Logic Corporation
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index a891041e8f50..0129096d20cc 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004, 2005, 2008 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/ctl/ctl_scsi_all.c b/sys/cam/ctl/ctl_scsi_all.c
index 98dba8cf2d83..7f77faac6531 100644
--- a/sys/cam/ctl/ctl_scsi_all.c
+++ b/sys/cam/ctl/ctl_scsi_all.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Implementation of Utility functions for all SCSI device types.
*
diff --git a/sys/cam/ctl/ctl_scsi_all.h b/sys/cam/ctl/ctl_scsi_all.h
index 91e41365cb49..f22ba50b0a08 100644
--- a/sys/cam/ctl/ctl_scsi_all.h
+++ b/sys/cam/ctl/ctl_scsi_all.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 2003 Kenneth D. Merry.
diff --git a/sys/cam/ctl/ctl_ser_table.c b/sys/cam/ctl/ctl_ser_table.c
index be9ca6b34631..72b2b09663e4 100644
--- a/sys/cam/ctl/ctl_ser_table.c
+++ b/sys/cam/ctl/ctl_ser_table.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c
index 66ac2a1023e9..b041dc980ad3 100644
--- a/sys/cam/ctl/ctl_tpc.c
+++ b/sys/cam/ctl/ctl_tpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014-2021 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_tpc.h b/sys/cam/ctl/ctl_tpc.h
index 109b11f2f26e..02f0ba2231fd 100644
--- a/sys/cam/ctl/ctl_tpc.h
+++ b/sys/cam/ctl/ctl_tpc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c
index ba6deada86a3..7d082f0f8e37 100644
--- a/sys/cam/ctl/ctl_tpc_local.c
+++ b/sys/cam/ctl/ctl_tpc_local.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2004, 2005 Silicon Graphics International Corp.
diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c
index 245c3e89dfb9..231317004df9 100644
--- a/sys/cam/ctl/ctl_util.c
+++ b/sys/cam/ctl/ctl_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/ctl_util.h b/sys/cam/ctl/ctl_util.h
index ab5cf8a8f48f..77e18466c5c4 100644
--- a/sys/cam/ctl/ctl_util.h
+++ b/sys/cam/ctl/ctl_util.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index d3023f9a6c8c..ef323326594f 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/cam/mmc/mmc.h b/sys/cam/mmc/mmc.h
index 44c4aad05e33..71738bdce116 100644
--- a/sys/cam/mmc/mmc.h
+++ b/sys/cam/mmc/mmc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014-2016 Ilya Bakulin. All rights reserved.
*
diff --git a/sys/cam/mmc/mmc_all.h b/sys/cam/mmc/mmc_all.h
index cb8c1bc7ae2b..a9c3f07779e2 100644
--- a/sys/cam/mmc/mmc_all.h
+++ b/sys/cam/mmc/mmc_all.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014-2016 Ilya Bakulin. All rights reserved.
*
diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c
index 68743d621ad4..a0281bf4992f 100644
--- a/sys/cam/mmc/mmc_da.c
+++ b/sys/cam/mmc/mmc_da.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Bernd Walter <tisco@FreeBSD.org> All rights reserved.
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org> All rights reserved.
diff --git a/sys/cam/mmc/mmc_sim_if.m b/sys/cam/mmc/mmc_sim_if.m
index f7d3f4df5ebb..8df26e4a08d4 100644
--- a/sys/cam/mmc/mmc_sim_if.m
+++ b/sys/cam/mmc/mmc_sim_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
#
diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c
index f050f9a5ccb6..d2cf5d64630b 100644
--- a/sys/cam/mmc/mmc_xpt.c
+++ b/sys/cam/mmc/mmc_xpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013,2014 Ilya Bakulin <ilya@bakulin.de>
* All rights reserved.
diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c
index 1eafdb1cece6..09f0956790a8 100644
--- a/sys/cam/nvme/nvme_all.c
+++ b/sys/cam/nvme/nvme_all.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Netflix, Inc.
*
diff --git a/sys/cam/nvme/nvme_all.h b/sys/cam/nvme/nvme_all.h
index da40dea1c7f1..17889142c4da 100644
--- a/sys/cam/nvme/nvme_all.h
+++ b/sys/cam/nvme/nvme_all.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Netflix, Inc.
*
diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index 16214f4a1488..f2721fe58da5 100644
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Netflix, Inc.
*
diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c
index bdc1219729d2..290f56e2c653 100644
--- a/sys/cam/nvme/nvme_xpt.c
+++ b/sys/cam/nvme/nvme_xpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Netflix, Inc.
*
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 6c56d4e3b234..cd1fa0bda58a 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -1,7 +1,7 @@
/*-
* Implementation of Utility functions for all SCSI device types.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 2003 Kenneth D. Merry.
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 760bb8e405cf..5b4d6afd51d6 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry.
diff --git a/sys/cam/scsi/scsi_cd.h b/sys/cam/scsi/scsi_cd.h
index 0968dafe4d2d..45c490f3ef70 100644
--- a/sys/cam/scsi/scsi_cd.h
+++ b/sys/cam/scsi/scsi_cd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2002 Kenneth D. Merry
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 2599bb841345..279bc41754a8 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-4-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-4-Clause)
*
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 8edad23402be..b1a61da13988 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1,7 +1,7 @@
/*-
* Implementation of SCSI Direct Access Peripheral driver for CAM.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c
index d823bc24101d..e19712f5d442 100644
--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_enc.h b/sys/cam/scsi/scsi_enc.h
index f53a99f2b233..58c40e61fb34 100644
--- a/sys/cam/scsi/scsi_enc.h
+++ b/sys/cam/scsi/scsi_enc.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD OR GPL-2.0)
+ * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_enc_internal.h b/sys/cam/scsi/scsi_enc_internal.h
index c8e0c65be850..99ff91abcd0e 100644
--- a/sys/cam/scsi/scsi_enc_internal.h
+++ b/sys/cam/scsi/scsi_enc_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_enc_safte.c b/sys/cam/scsi/scsi_enc_safte.c
index 7539531302f9..3a2f0fc481ce 100644
--- a/sys/cam/scsi/scsi_enc_safte.c
+++ b/sys/cam/scsi/scsi_enc_safte.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c
index dfec0a27d8e2..ca2dab4f0c3a 100644
--- a/sys/cam/scsi/scsi_enc_ses.c
+++ b/sys/cam/scsi/scsi_enc_ses.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Matthew Jacob
* Copyright (c) 2010 Spectra Logic Corporation
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 78a9ebe0a640..e05983e25728 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index 8fd7079e357c..5d09f782f610 100644
--- a/sys/cam/scsi/scsi_pass.h
+++ b/sys/cam/scsi/scsi_pass.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1999 Kenneth D. Merry.
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 50ac160db6e9..e34bb0333a0e 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Implementation of SCSI Processor Target Peripheral driver for CAM.
*
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index b05f8590adf5..0aa4e659784b 100644
--- a/sys/cam/scsi/scsi_pt.h
+++ b/sys/cam/scsi/scsi_pt.h
@@ -1,7 +1,7 @@
/*-
* Structure and function declarations for Processor type devices.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Justin T. Gibbs
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 5bd104237bdb..b13014aec66b 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1,7 +1,7 @@
/*-
* Implementation of SCSI Sequential Access Peripheral driver for CAM.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 Matthew Jacob
* Copyright (c) 2013, 2014, 2015, 2021 Spectra Logic Corporation
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index 908b16b684cf..d6fe3e0cbe86 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -2,7 +2,7 @@
* Structure and function declarations for the
* SCSI Sequential Access Peripheral driver for CAM.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999, 2000 Matthew Jacob
* Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
diff --git a/sys/cam/scsi/scsi_ses.h b/sys/cam/scsi/scsi_ses.h
index 1ee3e12381f3..ac8571810b07 100644
--- a/sys/cam/scsi/scsi_ses.h
+++ b/sys/cam/scsi/scsi_ses.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD OR GPL-2.0)
+ * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
*
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index 6b6e65a39f75..7a4be29b4a94 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Scott Long
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index 84aa16aa05f4..2c1d8d93dfdc 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -1,7 +1,7 @@
/*-
* Implementation of the Target Mode 'Black Hole device' for CAM.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index dd06ca7d64ba..823413deb5dd 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -1,7 +1,7 @@
/*-
* Generic SCSI Target Kernel Mode Driver
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Nate Lawson.
* Copyright (c) 1998, 1999, 2001, 2002 Justin T. Gibbs.
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index ca0384eb2da0..b49604fbf3c2 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -1,7 +1,7 @@
/*-
* Ioctl definitions for the SCSI Target Driver
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Nate Lawson.
* Copyright (c) 1998 Justin T. Gibbs.
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index b43a5fa2d0b1..307312907800 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -1,7 +1,7 @@
/*-
* Implementation of the SCSI Transport
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
diff --git a/sys/cam/scsi/smp_all.c b/sys/cam/scsi/smp_all.c
index 1b82327f9fb9..ad96418c171c 100644
--- a/sys/cam/scsi/smp_all.c
+++ b/sys/cam/scsi/smp_all.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/cam/scsi/smp_all.h b/sys/cam/scsi/smp_all.h
index 7fe44d2807a9..fe4b7a0863b1 100644
--- a/sys/cam/scsi/smp_all.h
+++ b/sys/cam/scsi/smp_all.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 851fa248b6f2..c84309800c10 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Doug Rabson
* All rights reserved.
diff --git a/sys/compat/freebsd32/freebsd32_capability.c b/sys/compat/freebsd32/freebsd32_capability.c
index 2796d2e9384f..d4a8e1de9ab2 100644
--- a/sys/compat/freebsd32/freebsd32_capability.c
+++ b/sys/compat/freebsd32/freebsd32_capability.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/compat/freebsd32/freebsd32_ipc.h b/sys/compat/freebsd32/freebsd32_ipc.h
index 10bf60320295..f1b773edc0fe 100644
--- a/sys/compat/freebsd32/freebsd32_ipc.h
+++ b/sys/compat/freebsd32/freebsd32_ipc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 9fd24a91080f..5e60c2bc7de3 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/sys/compat/freebsd32/freebsd32_misc.h b/sys/compat/freebsd32/freebsd32_misc.h
index f6f85adc8e72..a3c75e322bf8 100644
--- a/sys/compat/freebsd32/freebsd32_misc.h
+++ b/sys/compat/freebsd32/freebsd32_misc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/compat/freebsd32/freebsd32_signal.h b/sys/compat/freebsd32/freebsd32_signal.h
index cc7aeb858fb1..956ad55d36d3 100644
--- a/sys/compat/freebsd32/freebsd32_signal.h
+++ b/sys/compat/freebsd32/freebsd32_signal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index d3ad8c212721..8a18a9aaf9db 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* Copyright (c) 2003 Peter Wemm
diff --git a/sys/compat/lindebugfs/lindebugfs.c b/sys/compat/lindebugfs/lindebugfs.c
index 168d591625f2..a5e141b072f1 100644
--- a/sys/compat/lindebugfs/lindebugfs.c
+++ b/sys/compat/lindebugfs/lindebugfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c
index afb4e6466006..4e230f0cc2a6 100644
--- a/sys/compat/linsysfs/linsysfs.c
+++ b/sys/compat/linsysfs/linsysfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/compat/linux/linux_dtrace.h b/sys/compat/linux/linux_dtrace.h
index 0bf42f43bac1..967b193049ba 100644
--- a/sys/compat/linux/linux_dtrace.h
+++ b/sys/compat/linux/linux_dtrace.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Alexander Leidinger <netchild@FreeBSD.org>
* All rights reserved.
diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c
index e3812218514c..46596aa4a92a 100644
--- a/sys/compat/linux/linux_dummy.c
+++ b/sys/compat/linux/linux_dummy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/compat/linux/linux_elf.h b/sys/compat/linux/linux_elf.h
index 8f134cd4e233..2584a8a990c0 100644
--- a/sys/compat/linux/linux_elf.h
+++ b/sys/compat/linux/linux_elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chuck Tuffli
*
diff --git a/sys/compat/linux/linux_elf32.c b/sys/compat/linux/linux_elf32.c
index 17ee4b6baa0a..9c97354b0e3d 100644
--- a/sys/compat/linux/linux_elf32.c
+++ b/sys/compat/linux/linux_elf32.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Edward Tomasz Napierala <trasz@FreeBSD.org>
* Copyright (c) 2002 Doug Rabson
diff --git a/sys/compat/linux/linux_elf64.c b/sys/compat/linux/linux_elf64.c
index 2e283d763bbc..95c461d905ce 100644
--- a/sys/compat/linux/linux_elf64.c
+++ b/sys/compat/linux/linux_elf64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Edward Tomasz Napierala <trasz@FreeBSD.org>
* Copyright (c) 2002 Doug Rabson
diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c
index afe25f2cf035..ab877116b9fc 100644
--- a/sys/compat/linux/linux_emul.c
+++ b/sys/compat/linux/linux_emul.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* Copyright (c) 2006 Roman Divacky
diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h
index fde97c01895f..b4234b0f8cbc 100644
--- a/sys/compat/linux/linux_emul.h
+++ b/sys/compat/linux/linux_emul.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Roman Divacky
* All rights reserved.
diff --git a/sys/compat/linux/linux_errno.h b/sys/compat/linux/linux_errno.h
index 0eae6684ce44..36b46147759e 100644
--- a/sys/compat/linux/linux_errno.h
+++ b/sys/compat/linux/linux_errno.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 The FreeBSD Foundation
*
diff --git a/sys/compat/linux/linux_errno.inc b/sys/compat/linux/linux_errno.inc
index 37d83962fe44..eb8c811ab59b 100644
--- a/sys/compat/linux/linux_errno.inc
+++ b/sys/compat/linux/linux_errno.inc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c
index 57b5a3ea8d3a..885f8ccdbc56 100644
--- a/sys/compat/linux/linux_event.c
+++ b/sys/compat/linux/linux_event.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Roman Divacky
* Copyright (c) 2014 Dmitry Chagin <dchagin@FreeBSD.org>
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 4ce0a2cb4c0e..3dfea8946e33 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/compat/linux/linux_file.h b/sys/compat/linux/linux_file.h
index 061bd1fc2c24..1097b92725e3 100644
--- a/sys/compat/linux/linux_file.h
+++ b/sys/compat/linux/linux_file.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Roman Divacky
* All rights reserved.
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index 76c534f86f38..f843f44572cd 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2002 Doug Rabson
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index d265b015b799..9cc41b8d72f5 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2021 Dmitry Chagin <dchagin@FreeBSD.org>
* Copyright (c) 2008 Roman Divacky
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 25f5e6d8df0b..6a659695d407 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h
index 3e2078780d39..8d5d0abeeca7 100644
--- a/sys/compat/linux/linux_ioctl.h
+++ b/sys/compat/linux/linux_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 94c645adc099..679fe6824c77 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h
index a148814b8273..9f7b496dd7ef 100644
--- a/sys/compat/linux/linux_ipc.h
+++ b/sys/compat/linux/linux_ipc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 1ff82fc79289..29e86ea1f07b 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h
index 4d7f32a55646..c0c12f799382 100644
--- a/sys/compat/linux/linux_mib.h
+++ b/sys/compat/linux/linux_mib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h
index 96fcfcbf52b9..80f12ef13545 100644
--- a/sys/compat/linux/linux_misc.h
+++ b/sys/compat/linux/linux_misc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Roman Divacky
* All rights reserved.
diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c
index 9ae2b42a0dba..09697016cba7 100644
--- a/sys/compat/linux/linux_netlink.c
+++ b/sys/compat/linux/linux_netlink.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov
*
diff --git a/sys/compat/linux/linux_ptrace.c b/sys/compat/linux/linux_ptrace.c
index 5b971bbfb497..fc93881bb32a 100644
--- a/sys/compat/linux/linux_ptrace.c
+++ b/sys/compat/linux/linux_ptrace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Edward Tomasz Napierala <trasz@FreeBSD.org>
*
diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h
index aa385728efa6..ff601ba37dba 100644
--- a/sys/compat/linux/linux_signal.h
+++ b/sys/compat/linux/linux_signal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 0397fadb837d..0bcba7167f2f 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index a5c1949a4d28..c645ea600e8c 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index 6c4d049821ec..40e4a601102f 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index e6ad3fb967fb..181ecd2c7e12 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 The FreeBSD Project
* All rights reserved.
diff --git a/sys/compat/linux/linux_vdso_gtod.inc b/sys/compat/linux/linux_vdso_gtod.inc
index 8a3840edd87d..05f19c67022a 100644
--- a/sys/compat/linux/linux_vdso_gtod.inc
+++ b/sys/compat/linux/linux_vdso_gtod.inc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org>
diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h
index e996301e27f0..35fe174bc4c2 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpi.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Mark Johnston <markj@FreeBSD.org>
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
index c8a6385f26b2..60d730a651c0 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/acpi/video.h b/sys/compat/linuxkpi/common/include/acpi/video.h
index ace4a42a1016..6ec019abe73e 100644
--- a/sys/compat/linuxkpi/common/include/acpi/video.h
+++ b/sys/compat/linuxkpi/common/include/acpi/video.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/asm/barrier.h b/sys/compat/linuxkpi/common/include/asm/barrier.h
index ab59ff19dee0..d09f9c6d2c97 100644
--- a/sys/compat/linuxkpi/common/include/asm/barrier.h
+++ b/sys/compat/linuxkpi/common/include/asm/barrier.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/asm/fpu/api.h b/sys/compat/linuxkpi/common/include/asm/fpu/api.h
index f1ca1cedbcf1..b3a5bdff9bcb 100644
--- a/sys/compat/linuxkpi/common/include/asm/fpu/api.h
+++ b/sys/compat/linuxkpi/common/include/asm/fpu/api.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Greg V <greg@unrelenting.technology>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/acpi.h b/sys/compat/linuxkpi/common/include/linux/acpi.h
index 1a9d25e7a7ff..6c6188ece0dc 100644
--- a/sys/compat/linuxkpi/common/include/linux/acpi.h
+++ b/sys/compat/linuxkpi/common/include/linux/acpi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/anon_inodes.h b/sys/compat/linuxkpi/common/include/linux/anon_inodes.h
index cab5cbd4d67e..c69f6e152b17 100644
--- a/sys/compat/linuxkpi/common/include/linux/anon_inodes.h
+++ b/sys/compat/linuxkpi/common/include/linux/anon_inodes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/capability.h b/sys/compat/linuxkpi/common/include/linux/capability.h
index 547ee586ad8e..e3dacd4e9f15 100644
--- a/sys/compat/linuxkpi/common/include/linux/capability.h
+++ b/sys/compat/linuxkpi/common/include/linux/capability.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Rimvydas Jasinskas
* All rights reserved.
diff --git a/sys/compat/linuxkpi/common/include/linux/debugfs.h b/sys/compat/linuxkpi/common/include/linux/debugfs.h
index 734682cd7013..7d61f2a607a8 100644
--- a/sys/compat/linuxkpi/common/include/linux/debugfs.h
+++ b/sys/compat/linuxkpi/common/include/linux/debugfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/eventpoll.h b/sys/compat/linuxkpi/common/include/linux/eventpoll.h
index 1651ad01a55f..e77e6d689f86 100644
--- a/sys/compat/linuxkpi/common/include/linux/eventpoll.h
+++ b/sys/compat/linuxkpi/common/include/linux/eventpoll.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022, Jake Freeland <jfree@freebsd.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h
index 0056b590f239..1c2c97e03578 100644
--- a/sys/compat/linuxkpi/common/include/linux/highmem.h
+++ b/sys/compat/linuxkpi/common/include/linux/highmem.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Isilon Systems, Inc.
* Copyright (c) 2016 Matthew Macy (mmacy@mattmacy.io)
diff --git a/sys/compat/linuxkpi/common/include/linux/interval_tree.h b/sys/compat/linuxkpi/common/include/linux/interval_tree.h
index 3f8e0cb743d9..1eb8a2fb9181 100644
--- a/sys/compat/linuxkpi/common/include/linux/interval_tree.h
+++ b/sys/compat/linuxkpi/common/include/linux/interval_tree.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/interval_tree_generic.h b/sys/compat/linuxkpi/common/include/linux/interval_tree_generic.h
index 2ee615fda159..3ed6e105cbda 100644
--- a/sys/compat/linuxkpi/common/include/linux/interval_tree_generic.h
+++ b/sys/compat/linuxkpi/common/include/linux/interval_tree_generic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Mark Kettenis <kettenis@OpenBSD.org>
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/sys/compat/linuxkpi/common/include/linux/seq_file.h b/sys/compat/linuxkpi/common/include/linux/seq_file.h
index 8fb93646f9a5..3af4ef2bad45 100644
--- a/sys/compat/linuxkpi/common/include/linux/seq_file.h
+++ b/sys/compat/linuxkpi/common/include/linux/seq_file.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/seqlock.h b/sys/compat/linuxkpi/common/include/linux/seqlock.h
index a29709e77cdb..0fdc532bbd6f 100644
--- a/sys/compat/linuxkpi/common/include/linux/seqlock.h
+++ b/sys/compat/linuxkpi/common/include/linux/seqlock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/sort.h b/sys/compat/linuxkpi/common/include/linux/sort.h
index 91ccd7ff83c4..e6196d1f41c7 100644
--- a/sys/compat/linuxkpi/common/include/linux/sort.h
+++ b/sys/compat/linuxkpi/common/include/linux/sort.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/linux/stdarg.h b/sys/compat/linuxkpi/common/include/linux/stdarg.h
index b6141038d69a..ab2fdf7534e5 100644
--- a/sys/compat/linuxkpi/common/include/linux/stdarg.h
+++ b/sys/compat/linuxkpi/common/include/linux/stdarg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/include/stdarg.h b/sys/compat/linuxkpi/common/include/stdarg.h
index b6141038d69a..ab2fdf7534e5 100644
--- a/sys/compat/linuxkpi/common/include/stdarg.h
+++ b/sys/compat/linuxkpi/common/include/stdarg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c
index e092481ff979..81fd7ac90f4c 100644
--- a/sys/compat/linuxkpi/common/src/linux_acpi.c
+++ b/sys/compat/linuxkpi/common/src/linux_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Johannes Lundberg <johalun@FreeBSD.org>
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/sys/compat/linuxkpi/common/src/linux_fpu.c b/sys/compat/linuxkpi/common/src/linux_fpu.c
index 2f05ef94d5ac..68f378a9b173 100644
--- a/sys/compat/linuxkpi/common/src/linux_fpu.c
+++ b/sys/compat/linuxkpi/common/src/linux_fpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Greg V <greg@unrelenting.technology>
*
diff --git a/sys/compat/linuxkpi/common/src/linux_seq_file.c b/sys/compat/linuxkpi/common/src/linux_seq_file.c
index d4d8ef059ac4..4b1eb7ac4489 100644
--- a/sys/compat/linuxkpi/common/src/linux_seq_file.c
+++ b/sys/compat/linuxkpi/common/src/linux_seq_file.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/compat/linuxkpi/common/src/linux_simple_attr.c b/sys/compat/linuxkpi/common/src/linux_simple_attr.c
index 5cc0c0984755..4765391fd59d 100644
--- a/sys/compat/linuxkpi/common/src/linux_simple_attr.c
+++ b/sys/compat/linuxkpi/common/src/linux_simple_attr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022, Jake Freeland <jfree@freebsd.org>
*
diff --git a/sys/compat/linuxkpi/common/src/lkpi_iic_if.m b/sys/compat/linuxkpi/common/src/lkpi_iic_if.m
index c1b4abd79084..64db427864db 100644
--- a/sys/compat/linuxkpi/common/src/lkpi_iic_if.m
+++ b/sys/compat/linuxkpi/common/src/lkpi_iic_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
#
diff --git a/sys/conf/vdso_amd64.ldscript b/sys/conf/vdso_amd64.ldscript
index 40b147e3a715..0b0c15e8a241 100644
--- a/sys/conf/vdso_amd64.ldscript
+++ b/sys/conf/vdso_amd64.ldscript
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/conf/vdso_amd64_ia32.ldscript b/sys/conf/vdso_amd64_ia32.ldscript
index 543cfad4ef73..ea0ccf0ca6e7 100644
--- a/sys/conf/vdso_amd64_ia32.ldscript
+++ b/sys/conf/vdso_amd64_ia32.ldscript
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/contrib/dpdk_rte_lpm/dpdk_lpm.c b/sys/contrib/dpdk_rte_lpm/dpdk_lpm.c
index 51cd134132f6..b6b18d94a2e3 100644
--- a/sys/contrib/dpdk_rte_lpm/dpdk_lpm.c
+++ b/sys/contrib/dpdk_rte_lpm/dpdk_lpm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.c b/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.c
index ec1a3228d42b..b2fbcc99437c 100644
--- a/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.c
+++ b/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.h b/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.h
index f4d9668c9bc8..c5fbe6c8b74d 100644
--- a/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.h
+++ b/sys/contrib/dpdk_rte_lpm/dpdk_lpm6.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c
index 6405dcd1c516..9fd233e1f1d1 100644
--- a/sys/contrib/libnv/bsd_nvpair.c
+++ b/sys/contrib/libnv/bsd_nvpair.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 The FreeBSD Foundation
* Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/sys/contrib/libnv/cnvlist.c b/sys/contrib/libnv/cnvlist.c
index a35ddc482105..6597be30c9f2 100644
--- a/sys/contrib/libnv/cnvlist.c
+++ b/sys/contrib/libnv/cnvlist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Adam Starak <starak.adam@gmail.com>
* All rights reserved.
diff --git a/sys/contrib/libnv/dnvlist.c b/sys/contrib/libnv/dnvlist.c
index 3c6898d51256..0472deabd150 100644
--- a/sys/contrib/libnv/dnvlist.c
+++ b/sys/contrib/libnv/dnvlist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/contrib/libnv/nv_impl.h b/sys/contrib/libnv/nv_impl.h
index 1875c739beee..e9cd3ffabc3f 100644
--- a/sys/contrib/libnv/nv_impl.h
+++ b/sys/contrib/libnv/nv_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c
index 31ab62abeb67..56b818691660 100644
--- a/sys/contrib/libnv/nvlist.c
+++ b/sys/contrib/libnv/nvlist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 The FreeBSD Foundation
* Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/sys/contrib/libnv/nvlist_impl.h b/sys/contrib/libnv/nvlist_impl.h
index e7b4b6fdec21..e845382b65f8 100644
--- a/sys/contrib/libnv/nvlist_impl.h
+++ b/sys/contrib/libnv/nvlist_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
* Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/sys/contrib/libnv/nvpair_impl.h b/sys/contrib/libnv/nvpair_impl.h
index 63c3d8cc11cf..3fecf228afe9 100644
--- a/sys/contrib/libnv/nvpair_impl.h
+++ b/sys/contrib/libnv/nvpair_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 The FreeBSD Foundation
* Copyright (c) 2013-2015 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompat.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompat.h
index 59abe921dba9..1e542ead0b22 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompat.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompat.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/spl_condvar.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/spl_condvar.h
index 7405f647d59a..2835adafd416 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/spl_condvar.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/spl_condvar.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/off/dosmode_readonly_write.c b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/off/dosmode_readonly_write.c
index 372c3f7f64de..664a6d66c440 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/off/dosmode_readonly_write.c
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/off/dosmode_readonly_write.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 iXsystems, Inc.
*
diff --git a/sys/crypto/ccp/ccp.c b/sys/crypto/ccp/ccp.c
index 6e224d5f1544..06f51a6274a8 100644
--- a/sys/crypto/ccp/ccp.c
+++ b/sys/crypto/ccp/ccp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Chelsio Communications, Inc.
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
diff --git a/sys/crypto/ccp/ccp.h b/sys/crypto/ccp/ccp.h
index 197cbc6b4c36..ed7f12064cb5 100644
--- a/sys/crypto/ccp/ccp.h
+++ b/sys/crypto/ccp/ccp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/sys/crypto/ccp/ccp_hardware.c b/sys/crypto/ccp/ccp_hardware.c
index 68f46a553f3c..7c4dafdd8a22 100644
--- a/sys/crypto/ccp/ccp_hardware.c
+++ b/sys/crypto/ccp/ccp_hardware.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Chelsio Communications, Inc.
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
diff --git a/sys/crypto/ccp/ccp_hardware.h b/sys/crypto/ccp/ccp_hardware.h
index 844e0d67c0ef..38e589c2d981 100644
--- a/sys/crypto/ccp/ccp_hardware.h
+++ b/sys/crypto/ccp/ccp_hardware.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/sys/crypto/ccp/ccp_lsb.c b/sys/crypto/ccp/ccp_lsb.c
index a1d3f1b393c8..0176b9c295b9 100644
--- a/sys/crypto/ccp/ccp_lsb.c
+++ b/sys/crypto/ccp/ccp_lsb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/sys/crypto/ccp/ccp_lsb.h b/sys/crypto/ccp/ccp_lsb.h
index 8efdd631ad99..0e5d1dcc3e2d 100644
--- a/sys/crypto/ccp/ccp_lsb.h
+++ b/sys/crypto/ccp/ccp_lsb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/sys/crypto/chacha20_poly1305.c b/sys/crypto/chacha20_poly1305.c
index 516fc333f949..b4c5b6a2e56f 100644
--- a/sys/crypto/chacha20_poly1305.c
+++ b/sys/crypto/chacha20_poly1305.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/crypto/chacha20_poly1305.h b/sys/crypto/chacha20_poly1305.h
index 505a5ef9d6f0..e592156733dd 100644
--- a/sys/crypto/chacha20_poly1305.h
+++ b/sys/crypto/chacha20_poly1305.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/crypto/curve25519.c b/sys/crypto/curve25519.c
index 711cfec3a9e5..05b6d6a1c03f 100644
--- a/sys/crypto/curve25519.c
+++ b/sys/crypto/curve25519.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/crypto/curve25519.h b/sys/crypto/curve25519.h
index 3a1f26df015c..b867b9f86bc7 100644
--- a/sys/crypto/curve25519.h
+++ b/sys/crypto/curve25519.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/sys/crypto/openssl/ossl.c b/sys/crypto/openssl/ossl.c
index ad9b93dd960d..da481b141085 100644
--- a/sys/crypto/openssl/ossl.c
+++ b/sys/crypto/openssl/ossl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Netflix, Inc
*
diff --git a/sys/crypto/openssl/ossl_aarch64.c b/sys/crypto/openssl/ossl_aarch64.c
index 2a45a848808a..120102842326 100644
--- a/sys/crypto/openssl/ossl_aarch64.c
+++ b/sys/crypto/openssl/ossl_aarch64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 The FreeBSD Foundation
*
diff --git a/sys/crypto/openssl/ossl_chacha20.c b/sys/crypto/openssl/ossl_chacha20.c
index aa125121e8b4..888a03a74871 100644
--- a/sys/crypto/openssl/ossl_chacha20.c
+++ b/sys/crypto/openssl/ossl_chacha20.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Netflix, Inc
*
diff --git a/sys/crypto/openssl/ossl_x86.c b/sys/crypto/openssl/ossl_x86.c
index 60ff6fa0c759..261e93841100 100644
--- a/sys/crypto/openssl/ossl_x86.c
+++ b/sys/crypto/openssl/ossl_x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Netflix, Inc
*
diff --git a/sys/ddb/db_capture.c b/sys/ddb/db_capture.c
index 9cfef3865007..2cc230971d88 100644
--- a/sys/ddb/db_capture.c
+++ b/sys/ddb/db_capture.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/ddb/db_script.c b/sys/ddb/db_script.c
index 59e6ba676496..965bfed50d97 100644
--- a/sys/ddb/db_script.c
+++ b/sys/ddb/db_script.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/ddb/db_textdump.c b/sys/ddb/db_textdump.c
index aad8b6965318..4d007386cd99 100644
--- a/sys/ddb/db_textdump.c
+++ b/sys/ddb/db_textdump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/ddb/db_thread.c b/sys/ddb/db_thread.c
index 17b74c989ede..fb629910e9ce 100644
--- a/sys/ddb/db_thread.c
+++ b/sys/ddb/db_thread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index c783c390872b..b94a098ee632 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 4de1ab9a3164..a3573117801c 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Adaptec, Inc.
* All rights reserved.
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index edee5455c594..396bce10629f 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 4fcb5a0ad697..01957bccd9ee 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
index 3f2d8a827441..bc45e3179fb6 100644
--- a/sys/dev/aac/aac_linux.c
+++ b/sys/dev/aac/aac_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Scott Long
* All rights reserved.
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 084a03c8a83d..0bee9e55bf32 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aac/aac_tables.h b/sys/dev/aac/aac_tables.h
index a973f52f54ca..665d5dc31f30 100644
--- a/sys/dev/aac/aac_tables.h
+++ b/sys/dev/aac/aac_tables.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 665b2cc35b3c..fe459ed7bc47 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000-2001 Scott Long
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index f3bbb53b21e9..034985151fa3 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c
index 51a633e70515..d8b54ad1691f 100644
--- a/sys/dev/aacraid/aacraid.c
+++ b/sys/dev/aacraid/aacraid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c
index 9c73248472bd..c4f0db430293 100644
--- a/sys/dev/aacraid/aacraid_cam.c
+++ b/sys/dev/aacraid/aacraid_cam.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
diff --git a/sys/dev/aacraid/aacraid_debug.c b/sys/dev/aacraid/aacraid_debug.c
index ccfe0cddd78a..eafc70c0e9be 100644
--- a/sys/dev/aacraid/aacraid_debug.c
+++ b/sys/dev/aacraid/aacraid_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
diff --git a/sys/dev/aacraid/aacraid_debug.h b/sys/dev/aacraid/aacraid_debug.h
index 5ef43a4dc462..905a9ac0334a 100644
--- a/sys/dev/aacraid/aacraid_debug.h
+++ b/sys/dev/aacraid/aacraid_debug.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
diff --git a/sys/dev/aacraid/aacraid_endian.c b/sys/dev/aacraid/aacraid_endian.c
index 29da6c4d4d4f..0b1c6b71664e 100644
--- a/sys/dev/aacraid/aacraid_endian.c
+++ b/sys/dev/aacraid/aacraid_endian.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Leandro Lupori
*
diff --git a/sys/dev/aacraid/aacraid_endian.h b/sys/dev/aacraid/aacraid_endian.h
index 375811c58d6c..0a5976be5997 100644
--- a/sys/dev/aacraid/aacraid_endian.h
+++ b/sys/dev/aacraid/aacraid_endian.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Leandro Lupori
*
diff --git a/sys/dev/aacraid/aacraid_linux.c b/sys/dev/aacraid/aacraid_linux.c
index 7592a0d5a8cb..589f0167320c 100644
--- a/sys/dev/aacraid/aacraid_linux.c
+++ b/sys/dev/aacraid/aacraid_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Scott Long
* Copyright (c) 2002-2010 Adaptec, Inc.
diff --git a/sys/dev/aacraid/aacraid_pci.c b/sys/dev/aacraid/aacraid_pci.c
index f445a073b6d5..3e019c480388 100644
--- a/sys/dev/aacraid/aacraid_pci.c
+++ b/sys/dev/aacraid/aacraid_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/aacraid/aacraid_reg.h b/sys/dev/aacraid/aacraid_reg.h
index a2b7ba4d0ecc..19bee3822827 100644
--- a/sys/dev/aacraid/aacraid_reg.h
+++ b/sys/dev/aacraid/aacraid_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000-2001 Scott Long
diff --git a/sys/dev/aacraid/aacraid_var.h b/sys/dev/aacraid/aacraid_var.h
index bbafdafb8840..e5178b222a70 100644
--- a/sys/dev/aacraid/aacraid_var.h
+++ b/sys/dev/aacraid/aacraid_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c
index 6da1480e94dd..9103a3ba93f0 100644
--- a/sys/dev/acpica/acpi_apei.c
+++ b/sys/dev/acpica/acpi_apei.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander Motin <mav@FreeBSD.org>
*
diff --git a/sys/dev/acpica/acpi_pxm.c b/sys/dev/acpica/acpi_pxm.c
index 18a21ee6b0f8..822143022199 100644
--- a/sys/dev/acpica/acpi_pxm.c
+++ b/sys/dev/acpica/acpi_pxm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/adb/adb.h b/sys/dev/adb/adb.h
index 6b007c469597..4875a4c5843a 100644
--- a/sys/dev/adb/adb.h
+++ b/sys/dev/adb/adb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/adb/adb_bus.c b/sys/dev/adb/adb_bus.c
index 8c300c83df10..70968266fef2 100644
--- a/sys/dev/adb/adb_bus.c
+++ b/sys/dev/adb/adb_bus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index 69ef6271bfa2..f70a4d449d37 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/adb/adb_mouse.c b/sys/dev/adb/adb_mouse.c
index 6f6f9d633b52..17c4e44c99e4 100644
--- a/sys/dev/adb/adb_mouse.c
+++ b/sys/dev/adb/adb_mouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/adb/adbvar.h b/sys/dev/adb/adbvar.h
index b382e2f597f5..afb21287756f 100644
--- a/sys/dev/adb/adbvar.h
+++ b/sys/dev/adb/adbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
index 3858f4867839..2447fd50c991 100644
--- a/sys/dev/ae/if_ae.c
+++ b/sys/dev/ae/if_ae.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/ae/if_aereg.h b/sys/dev/ae/if_aereg.h
index c42da11f1e1b..8faeb13368f9 100644
--- a/sys/dev/ae/if_aereg.h
+++ b/sys/dev/ae/if_aereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/ae/if_aevar.h b/sys/dev/ae/if_aevar.h
index b6010e30ec84..cd270508f9a3 100644
--- a/sys/dev/ae/if_aevar.h
+++ b/sys/dev/ae/if_aevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
index bbf9a058e9be..471ef5bd24a4 100644
--- a/sys/dev/age/if_age.c
+++ b/sys/dev/age/if_age.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/age/if_agereg.h b/sys/dev/age/if_agereg.h
index b49c28aac05e..e62840ecca7b 100644
--- a/sys/dev/age/if_agereg.h
+++ b/sys/dev/age/if_agereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/age/if_agevar.h b/sys/dev/age/if_agevar.h
index 800c33d8e619..176aa6e57ad6 100644
--- a/sys/dev/age/if_agevar.h
+++ b/sys/dev/age/if_agevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index b4998418b8b4..f3c0c26bc7e0 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index 9a49b6a9c015..5c557c4f1d70 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index 6a90e1c7392a..a65bf8208c8b 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c
index 32395bc42081..6f52714e5e6f 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/agp_amd64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/agp/agp_apple.c b/sys/dev/agp/agp_apple.c
index 800a5a195fe3..74fef3204018 100644
--- a/sys/dev/agp/agp_apple.c
+++ b/sys/dev/agp/agp_apple.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c
index dc56af11f72f..e321e4d5d09d 100644
--- a/sys/dev/agp/agp_ati.c
+++ b/sys/dev/agp/agp_ati.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Eric Anholt
* All rights reserved.
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 0fcc10058181..972fee455eea 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* Copyright (c) 2000 Ruslan Ermilov
diff --git a/sys/dev/agp/agp_i810.h b/sys/dev/agp/agp_i810.h
index d3633150fed5..d3b45e6f3e25 100644
--- a/sys/dev/agp/agp_i810.h
+++ b/sys/dev/agp/agp_i810.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index c4a2c6cd0d27..bdf808910be9 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c
index aa8df5e06f86..989691deb6bf 100644
--- a/sys/dev/agp/agp_nvidia.c
+++ b/sys/dev/agp/agp_nvidia.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index db498ed81463..69fbac8c8465 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index 97bb0262f5de..d6e9f9f427b7 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agppriv.h b/sys/dev/agp/agppriv.h
index f6fa3c5526bd..62fbb32c1d3e 100644
--- a/sys/dev/agp/agppriv.h
+++ b/sys/dev/agp/agppriv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agpreg.h b/sys/dev/agp/agpreg.h
index 3a0abfeccd04..150bd23c39ec 100644
--- a/sys/dev/agp/agpreg.h
+++ b/sys/dev/agp/agpreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/agp/agpvar.h b/sys/dev/agp/agpvar.h
index c3c901dcf537..51ccd4f58dde 100644
--- a/sys/dev/agp/agpvar.h
+++ b/sys/dev/agp/agpvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index 45171a34cfbf..6ac3110a4f9c 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h
index e28c02d6678e..bc326efd67a2 100644
--- a/sys/dev/ahci/ahci.h
+++ b/sys/dev/ahci/ahci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/ahci/ahci_fsl_fdt.c b/sys/dev/ahci/ahci_fsl_fdt.c
index f7491ee9768c..a491e5af2a97 100644
--- a/sys/dev/ahci/ahci_fsl_fdt.c
+++ b/sys/dev/ahci/ahci_fsl_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group
* Copyright (c) 2020 Semihalf
diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c
index 20b36830ce9a..6f1f29900789 100644
--- a/sys/dev/ahci/ahciem.c
+++ b/sys/dev/ahci/ahciem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
index c6928db3885c..d396a9e6a201 100644
--- a/sys/dev/alc/if_alc.c
+++ b/sys/dev/alc/if_alc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/alc/if_alcreg.h b/sys/dev/alc/if_alcreg.h
index 7668f0960d9f..81b3287115ee 100644
--- a/sys/dev/alc/if_alcreg.h
+++ b/sys/dev/alc/if_alcreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/alc/if_alcvar.h b/sys/dev/alc/if_alcvar.h
index 926c80021858..0ddd545c6507 100644
--- a/sys/dev/alc/if_alcvar.h
+++ b/sys/dev/alc/if_alcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c
index decd61153cc6..7a0da118531c 100644
--- a/sys/dev/ale/if_ale.c
+++ b/sys/dev/ale/if_ale.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ale/if_alereg.h b/sys/dev/ale/if_alereg.h
index e5727377a5e7..ca7b29b163ce 100644
--- a/sys/dev/ale/if_alereg.h
+++ b/sys/dev/ale/if_alereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ale/if_alevar.h b/sys/dev/ale/if_alevar.h
index 628a67b5623a..c594ed059064 100644
--- a/sys/dev/ale/if_alevar.h
+++ b/sys/dev/ale/if_alevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c
index b87bad6495c4..47430661c821 100644
--- a/sys/dev/altera/atse/if_atse.c
+++ b/sys/dev/altera/atse/if_atse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 Bjoern A. Zeeb
* Copyright (c) 2014 Robert N. M. Watson
diff --git a/sys/dev/altera/atse/if_atse_fdt.c b/sys/dev/altera/atse/if_atse_fdt.c
index 83eb823b3204..25bfb99f44de 100644
--- a/sys/dev/altera/atse/if_atse_fdt.c
+++ b/sys/dev/altera/atse/if_atse_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Bjoern A. Zeeb
* All rights reserved.
diff --git a/sys/dev/altera/atse/if_atse_nexus.c b/sys/dev/altera/atse/if_atse_nexus.c
index 146ea752dbe7..d88f6c2b139a 100644
--- a/sys/dev/altera/atse/if_atse_nexus.c
+++ b/sys/dev/altera/atse/if_atse_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012,2013 Bjoern A. Zeeb
* All rights reserved.
diff --git a/sys/dev/altera/atse/if_atsereg.h b/sys/dev/altera/atse/if_atsereg.h
index 5841d14f759e..eeb2fc144d60 100644
--- a/sys/dev/altera/atse/if_atsereg.h
+++ b/sys/dev/altera/atse/if_atsereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Bjoern A. Zeeb
* All rights reserved.
diff --git a/sys/dev/altera/avgen/altera_avgen.c b/sys/dev/altera/avgen/altera_avgen.c
index d7dd7d29b1e0..4118413c77dd 100644
--- a/sys/dev/altera/avgen/altera_avgen.c
+++ b/sys/dev/altera/avgen/altera_avgen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/avgen/altera_avgen.h b/sys/dev/altera/avgen/altera_avgen.h
index 12496911f7c1..4755ea0c3cfb 100644
--- a/sys/dev/altera/avgen/altera_avgen.h
+++ b/sys/dev/altera/avgen/altera_avgen.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/avgen/altera_avgen_fdt.c b/sys/dev/altera/avgen/altera_avgen_fdt.c
index 50cf26bc56be..089cd927b6ef 100644
--- a/sys/dev/altera/avgen/altera_avgen_fdt.c
+++ b/sys/dev/altera/avgen/altera_avgen_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c
index edce8488cfeb..c1c38cea1b5b 100644
--- a/sys/dev/altera/avgen/altera_avgen_nexus.c
+++ b/sys/dev/altera/avgen/altera_avgen_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart.h b/sys/dev/altera/jtag_uart/altera_jtag_uart.h
index 9fc2877930b7..a0beb6955cf3 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart.h
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
index 51e0b2b28699..a2c3dd04e77e 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
index b9ea707131da..5f4cf46fbd94 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
index 3f7b555eb03d..4c987a542c44 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
index 611e5778c6b4..54982b2ed8e4 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/sdcard/altera_sdcard.c b/sys/dev/altera/sdcard/altera_sdcard.c
index 57e10fed68bd..350bb02853ef 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.c
+++ b/sys/dev/altera/sdcard/altera_sdcard.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/sdcard/altera_sdcard.h b/sys/dev/altera/sdcard/altera_sdcard.h
index a486971faa37..1e1bf10f4ea9 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.h
+++ b/sys/dev/altera/sdcard/altera_sdcard.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/sdcard/altera_sdcard_disk.c b/sys/dev/altera/sdcard/altera_sdcard_disk.c
index bf60f3a8973c..ede190f47994 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_disk.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/sdcard/altera_sdcard_fdt.c b/sys/dev/altera/sdcard/altera_sdcard_fdt.c
index 93f9cb888332..c3f3ddae7fb7 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_fdt.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/sdcard/altera_sdcard_io.c b/sys/dev/altera/sdcard/altera_sdcard_io.c
index 116a8cb847d3..142ffd5cb050 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_io.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
index b6bbcdd949e2..0c361da7a682 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/altera/softdma/a_api.h b/sys/dev/altera/softdma/a_api.h
index 4cb2a81903c0..845dceb2d21c 100644
--- a/sys/dev/altera/softdma/a_api.h
+++ b/sys/dev/altera/softdma/a_api.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Bjoern A. Zeeb
* All rights reserved.
diff --git a/sys/dev/amdgpio/amdgpio.c b/sys/dev/amdgpio/amdgpio.c
index 0716f272c8f1..4b25e4f2701b 100644
--- a/sys/dev/amdgpio/amdgpio.c
+++ b/sys/dev/amdgpio/amdgpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Advanced Micro Devices
* All rights reserved.
diff --git a/sys/dev/amdgpio/amdgpio.h b/sys/dev/amdgpio/amdgpio.h
index 4f203a7d7c57..92d1a71d53c3 100644
--- a/sys/dev/amdgpio/amdgpio.h
+++ b/sys/dev/amdgpio/amdgpio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Advanced Micro Devices
* All rights reserved.
diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c
index a7ab67f1a8b8..aecae32044e0 100644
--- a/sys/dev/amdsbwd/amdsbwd.c
+++ b/sys/dev/amdsbwd/amdsbwd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Andriy Gapon <avg@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 238ae572d096..5b9c9be4a56f 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2009 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2009 Norikatsu Shigemura <nork@FreeBSD.org>
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 1c4f252345e9..8ffdb1dcd22e 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index a8dd9def064a..a26f51bb30c1 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 4eee088345f8..b2dea5ba4947 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Jonathan Lemon
* Copyright (c) 1999, 2000 Michael Smith
diff --git a/sys/dev/amr/amr_linux.c b/sys/dev/amr/amr_linux.c
index 9e0a5cac693e..053bff6af39a 100644
--- a/sys/dev/amr/amr_linux.c
+++ b/sys/dev/amr/amr_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Paul Saab
* All rights reserved.
diff --git a/sys/dev/amr/amr_tables.h b/sys/dev/amr/amr_tables.h
index 8cc114178a6d..5c1226ddfa70 100644
--- a/sys/dev/amr/amr_tables.h
+++ b/sys/dev/amr/amr_tables.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index c069555b7e18..da1f374d8915 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index 1ec6c5e56d6d..fba81b28c535 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index ae1a4acbc892..9d1fcd1c4de1 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index 6b4030215605..583eaa364b69 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
index 769903701a99..5c4a4a4d3ab6 100644
--- a/sys/dev/asmc/asmcvar.h
+++ b/sys/dev/asmc/asmcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 220b3a614906..e7a595709d81 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index da9419b2ed32..743a99255db0 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index bd6ac72b7936..8f81def5638c 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c
index 0c2b0acf0c96..7adb449e799b 100644
--- a/sys/dev/ata/ata-isa.c
+++ b/sys/dev/ata/ata-isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c
index 113e2b3fd293..e552da308378 100644
--- a/sys/dev/ata/ata-lowlevel.c
+++ b/sys/dev/ata/ata-lowlevel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index 31cc3ad15583..91d74e291d29 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 2fc8b278d589..cc20cfcbc97d 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/ata-sata.c b/sys/dev/ata/ata-sata.c
index 9632c53ca8d2..7f1e8fc53147 100644
--- a/sys/dev/ata/ata-sata.c
+++ b/sys/dev/ata/ata-sata.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c
index f5fad02cf89f..7da56b700bfe 100644
--- a/sys/dev/ata/chipsets/ata-acard.c
+++ b/sys/dev/ata/chipsets/ata-acard.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c
index 598b15304b4f..dd99c228326c 100644
--- a/sys/dev/ata/chipsets/ata-acerlabs.c
+++ b/sys/dev/ata/chipsets/ata-acerlabs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c
index 2ff84ee55273..604481bf591c 100644
--- a/sys/dev/ata/chipsets/ata-amd.c
+++ b/sys/dev/ata/chipsets/ata-amd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c
index ef1abc9a4b2b..d12b9caedf27 100644
--- a/sys/dev/ata/chipsets/ata-ati.c
+++ b/sys/dev/ata/chipsets/ata-ati.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c
index 2dd19ec88f39..2b733c3ee2e5 100644
--- a/sys/dev/ata/chipsets/ata-cenatek.c
+++ b/sys/dev/ata/chipsets/ata-cenatek.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c
index 80fea4c53df0..5e992988bd43 100644
--- a/sys/dev/ata/chipsets/ata-cypress.c
+++ b/sys/dev/ata/chipsets/ata-cypress.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c
index f0901bb10976..37aadcead74c 100644
--- a/sys/dev/ata/chipsets/ata-cyrix.c
+++ b/sys/dev/ata/chipsets/ata-cyrix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-fsl.c b/sys/dev/ata/chipsets/ata-fsl.c
index 63660ef9f8e2..b5fb408dae1d 100644
--- a/sys/dev/ata/chipsets/ata-fsl.c
+++ b/sys/dev/ata/chipsets/ata-fsl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c
index 17fbd4c67ddc..f8741f250450 100644
--- a/sys/dev/ata/chipsets/ata-highpoint.c
+++ b/sys/dev/ata/chipsets/ata-highpoint.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index a5260fc63336..99516d12d1bb 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c
index 3c909beb40e8..f39d8d9c594e 100644
--- a/sys/dev/ata/chipsets/ata-ite.c
+++ b/sys/dev/ata/chipsets/ata-ite.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c
index 49bc1dc7ca85..a29d39b31014 100644
--- a/sys/dev/ata/chipsets/ata-jmicron.c
+++ b/sys/dev/ata/chipsets/ata-jmicron.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c
index 626f3fc0a506..fdcf2e2fd625 100644
--- a/sys/dev/ata/chipsets/ata-marvell.c
+++ b/sys/dev/ata/chipsets/ata-marvell.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c
index 27e816af498a..ff65dcf5483f 100644
--- a/sys/dev/ata/chipsets/ata-micron.c
+++ b/sys/dev/ata/chipsets/ata-micron.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c
index f14f669b2ce5..670e1a45ef35 100644
--- a/sys/dev/ata/chipsets/ata-national.c
+++ b/sys/dev/ata/chipsets/ata-national.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c
index 395988020c5f..6988bb6d6648 100644
--- a/sys/dev/ata/chipsets/ata-netcell.c
+++ b/sys/dev/ata/chipsets/ata-netcell.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c
index 302bfe2ab914..080d3d1883ab 100644
--- a/sys/dev/ata/chipsets/ata-nvidia.c
+++ b/sys/dev/ata/chipsets/ata-nvidia.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c
index cdda3df2c332..ae0200aa7e6f 100644
--- a/sys/dev/ata/chipsets/ata-promise.c
+++ b/sys/dev/ata/chipsets/ata-promise.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c
index 4497dfe9bfeb..ab6c7a275983 100644
--- a/sys/dev/ata/chipsets/ata-serverworks.c
+++ b/sys/dev/ata/chipsets/ata-serverworks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c
index af71c752a2fd..f56091ee2736 100644
--- a/sys/dev/ata/chipsets/ata-siliconimage.c
+++ b/sys/dev/ata/chipsets/ata-siliconimage.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c
index 34d2c2467183..e4e4fd941ca8 100644
--- a/sys/dev/ata/chipsets/ata-sis.c
+++ b/sys/dev/ata/chipsets/ata-sis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c
index 18821b986d3c..6997d9c2b488 100644
--- a/sys/dev/ata/chipsets/ata-via.c
+++ b/sys/dev/ata/chipsets/ata-via.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c
index a760540b0f3a..4721bc6ad7b0 100644
--- a/sys/dev/ath/ah_osdep.c
+++ b/sys/dev/ath/ah_osdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/ah_osdep.h b/sys/dev/ath/ah_osdep.h
index 2a34552b0a11..1d9178d6935e 100644
--- a/sys/dev/ath/ah_osdep.h
+++ b/sys/dev/ath/ah_osdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/ath_dfs/null/dfs_null.c b/sys/dev/ath/ath_dfs/null/dfs_null.c
index 2c262d1c9ef5..6a202ddfb518 100644
--- a/sys/dev/ath/ath_dfs/null/dfs_null.c
+++ b/sys/dev/ath/ath_dfs/null/dfs_null.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
* All rights reserved.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9002phy.h b/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
index 2e69e27fc6fb..1ef8752a3062 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
index 9d75e3b43131..cd3a61ffc4c9 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
index a607ece431bb..57ff816890fd 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
index e688f529ae07..d9a494847de7 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
index ce529c70e45d..b4effed40c5f 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
index 25ae031da2af..764ae63f7e38 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
index 7048a90e0ba2..e0c5e7104501 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
index 48fe382d2cba..ec13e5c235f2 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
index 981cbf429e0a..c1226c818d0e 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285phy.h b/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
index 8d6b41201a69..620a22aed055 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
index 3bdb4c7f0810..6db2b670b406 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
index 8636b7a39fde..54d83bb22609 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Atheros Communications Inc.
*
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c b/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
index 9cc2186bb178..1fd782a6e880 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
*
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.c b/sys/dev/ath/ath_rate/onoe/onoe.c
index 5229feaeebfd..ba748d35fd9a 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.c
+++ b/sys/dev/ath/ath_rate/onoe/onoe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/ath_rate/onoe/onoe.h b/sys/dev/ath/ath_rate/onoe/onoe.h
index 16a7bdd56217..0579b5f5fa7a 100644
--- a/sys/dev/ath/ath_rate/onoe/onoe.h
+++ b/sys/dev/ath/ath_rate/onoe/onoe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 34a9311c834a..2b65980c5b3b 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c
index ea329589f1ab..afbd7ec3da26 100644
--- a/sys/dev/ath/if_ath_ahb.c
+++ b/sys/dev/ath/if_ath_ahb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd
diff --git a/sys/dev/ath/if_ath_alq.c b/sys/dev/ath/if_ath_alq.c
index d5f53a6670bd..d24d537fc2fa 100644
--- a/sys/dev/ath/if_ath_alq.c
+++ b/sys/dev/ath/if_ath_alq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_alq.h b/sys/dev/ath/if_ath_alq.h
index 609c444a72fc..2fed158e029b 100644
--- a/sys/dev/ath/if_ath_alq.h
+++ b/sys/dev/ath/if_ath_alq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_beacon.c b/sys/dev/ath/if_ath_beacon.c
index ac1244c5f8e7..6a6d994df9e7 100644
--- a/sys/dev/ath/if_ath_beacon.c
+++ b/sys/dev/ath/if_ath_beacon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_beacon.h b/sys/dev/ath/if_ath_beacon.h
index cda145ba32e2..deafdfa4329d 100644
--- a/sys/dev/ath/if_ath_beacon.h
+++ b/sys/dev/ath/if_ath_beacon.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_btcoex.c b/sys/dev/ath/if_ath_btcoex.c
index 1f0400b696f5..f29d3856200b 100644
--- a/sys/dev/ath/if_ath_btcoex.c
+++ b/sys/dev/ath/if_ath_btcoex.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_btcoex.h b/sys/dev/ath/if_ath_btcoex.h
index db8262e50974..5b7422aa37b8 100644
--- a/sys/dev/ath/if_ath_btcoex.h
+++ b/sys/dev/ath/if_ath_btcoex.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_debug.c b/sys/dev/ath/if_ath_debug.c
index 3ed6a4d8d715..905f5157c7eb 100644
--- a/sys/dev/ath/if_ath_debug.c
+++ b/sys/dev/ath/if_ath_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_debug.h b/sys/dev/ath/if_ath_debug.h
index c97e98eddf42..89e9a33a4ff1 100644
--- a/sys/dev/ath/if_ath_debug.h
+++ b/sys/dev/ath/if_ath_debug.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c
index a33b5ddad882..e360781d69b2 100644
--- a/sys/dev/ath/if_ath_keycache.c
+++ b/sys/dev/ath/if_ath_keycache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_keycache.h b/sys/dev/ath/if_ath_keycache.h
index 1efb47d01e46..a87846ebb261 100644
--- a/sys/dev/ath/if_ath_keycache.h
+++ b/sys/dev/ath/if_ath_keycache.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_led.c b/sys/dev/ath/if_ath_led.c
index 8b4ac821f2be..e598c8559ef4 100644
--- a/sys/dev/ath/if_ath_led.c
+++ b/sys/dev/ath/if_ath_led.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_led.h b/sys/dev/ath/if_ath_led.h
index b03829152676..f380ef0e9086 100644
--- a/sys/dev/ath/if_ath_led.h
+++ b/sys/dev/ath/if_ath_led.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c
index c89a6b107749..a0d9d4f46d97 100644
--- a/sys/dev/ath/if_ath_lna_div.c
+++ b/sys/dev/ath/if_ath_lna_div.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_lna_div.h b/sys/dev/ath/if_ath_lna_div.h
index 247f1806920b..b5f87721a137 100644
--- a/sys/dev/ath/if_ath_lna_div.h
+++ b/sys/dev/ath/if_ath_lna_div.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_misc.h b/sys/dev/ath/if_ath_misc.h
index b108c29bab4b..34965e87cf67 100644
--- a/sys/dev/ath/if_ath_misc.h
+++ b/sys/dev/ath/if_ath_misc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index d3b130e091dc..9bf4a27c1e54 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c
index 58da21f09638..813fc8cf33bd 100644
--- a/sys/dev/ath/if_ath_rx.c
+++ b/sys/dev/ath/if_ath_rx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_rx.h b/sys/dev/ath/if_ath_rx.h
index a61313da63d5..753c05cf90ec 100644
--- a/sys/dev/ath/if_ath_rx.h
+++ b/sys/dev/ath/if_ath_rx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_rx_edma.c b/sys/dev/ath/if_ath_rx_edma.c
index 03cd20790d1d..1c91697179cf 100644
--- a/sys/dev/ath/if_ath_rx_edma.c
+++ b/sys/dev/ath/if_ath_rx_edma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_rx_edma.h b/sys/dev/ath/if_ath_rx_edma.h
index d53ecb4e92ca..7b3fca9934c8 100644
--- a/sys/dev/ath/if_ath_rx_edma.h
+++ b/sys/dev/ath/if_ath_rx_edma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_spectral.c b/sys/dev/ath/if_ath_spectral.c
index 44d5064c182d..f0bfefdf553f 100644
--- a/sys/dev/ath/if_ath_spectral.c
+++ b/sys/dev/ath/if_ath_spectral.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_spectral.h b/sys/dev/ath/if_ath_spectral.h
index ceb372357d21..0460e893221b 100644
--- a/sys/dev/ath/if_ath_spectral.h
+++ b/sys/dev/ath/if_ath_spectral.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_sysctl.c b/sys/dev/ath/if_ath_sysctl.c
index a7ffad60dbab..96ff4cdd1495 100644
--- a/sys/dev/ath/if_ath_sysctl.c
+++ b/sys/dev/ath/if_ath_sysctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_sysctl.h b/sys/dev/ath/if_ath_sysctl.h
index fca5fb9d3dd7..4fe793ef2471 100644
--- a/sys/dev/ath/if_ath_sysctl.h
+++ b/sys/dev/ath/if_ath_sysctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tdma.c b/sys/dev/ath/if_ath_tdma.c
index f0900435c6d6..917b6deaeb28 100644
--- a/sys/dev/ath/if_ath_tdma.c
+++ b/sys/dev/ath/if_ath_tdma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tdma.h b/sys/dev/ath/if_ath_tdma.h
index 62f3240a3d0a..c1820579dd86 100644
--- a/sys/dev/ath/if_ath_tdma.h
+++ b/sys/dev/ath/if_ath_tdma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tsf.h b/sys/dev/ath/if_ath_tsf.h
index f7837e2d5dc2..684ca901ea5c 100644
--- a/sys/dev/ath/if_ath_tsf.h
+++ b/sys/dev/ath/if_ath_tsf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index 46ac7889f3d6..78b1800c40db 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2010-2012 Adrian Chadd, Xenion Pty Ltd
diff --git a/sys/dev/ath/if_ath_tx.h b/sys/dev/ath/if_ath_tx.h
index 2ad2f75e926d..13cab3553570 100644
--- a/sys/dev/ath/if_ath_tx.h
+++ b/sys/dev/ath/if_ath_tx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tx_edma.c b/sys/dev/ath/if_ath_tx_edma.c
index 4ec98b3382c9..3f07c7e80c70 100644
--- a/sys/dev/ath/if_ath_tx_edma.c
+++ b/sys/dev/ath/if_ath_tx_edma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tx_edma.h b/sys/dev/ath/if_ath_tx_edma.h
index 8718ce1d770a..a5967a3cedd9 100644
--- a/sys/dev/ath/if_ath_tx_edma.h
+++ b/sys/dev/ath/if_ath_tx_edma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c
index 1af1ec9120c7..f8e794764e06 100644
--- a/sys/dev/ath/if_ath_tx_ht.c
+++ b/sys/dev/ath/if_ath_tx_ht.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
* All rights reserved.
diff --git a/sys/dev/ath/if_ath_tx_ht.h b/sys/dev/ath/if_ath_tx_ht.h
index 970a9de62006..3d87355b2e12 100644
--- a/sys/dev/ath/if_ath_tx_ht.h
+++ b/sys/dev/ath/if_ath_tx_ht.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
* All rights reserved.
diff --git a/sys/dev/ath/if_athdfs.h b/sys/dev/ath/if_athdfs.h
index 82978f815672..88b699ad795f 100644
--- a/sys/dev/ath/if_athdfs.h
+++ b/sys/dev/ath/if_athdfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
* All rights reserved.
diff --git a/sys/dev/ath/if_athioctl.h b/sys/dev/ath/if_athioctl.h
index fec48bb4c890..63f1c7f0934b 100644
--- a/sys/dev/ath/if_athioctl.h
+++ b/sys/dev/ath/if_athioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/ath/if_athrate.h b/sys/dev/ath/if_athrate.h
index 45711a1735bc..5090c3d39d69 100644
--- a/sys/dev/ath/if_athrate.h
+++ b/sys/dev/ath/if_athrate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
* Copyright (c) 2004 Video54 Technologies, Inc.
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index 7817fe667281..add010c235bd 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index cfaf7749a64c..5cf6693b13de 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index 9513e238f153..63521c5bd0ae 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index c882403d89ab..6a8378828ebb 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 8ac80d95258d..6a9078c86fde 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h
index 54e40f4b839a..0c6e3f14ba3b 100644
--- a/sys/dev/atkbdc/atkbdc_subr.h
+++ b/sys/dev/atkbdc/atkbdc_subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index 94ef42ebaf48..24083eb2e3a7 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/axgbe/if_axgbe.c b/sys/dev/axgbe/if_axgbe.c
index 415c4016e3a9..4d6ce4a9be77 100644
--- a/sys/dev/axgbe/if_axgbe.c
+++ b/sys/dev/axgbe/if_axgbe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016,2017 SoftIron Inc.
* Copyright (c) 2020 Advanced Micro Devices, Inc.
diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c
index 7d7c1acb792b..0d47a9821f03 100644
--- a/sys/dev/axgbe/if_axgbe_pci.c
+++ b/sys/dev/axgbe/if_axgbe_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Advanced Micro Devices, Inc.
*
diff --git a/sys/dev/axgbe/xgbe-sysctl.c b/sys/dev/axgbe/xgbe-sysctl.c
index f7998b943b16..1d73dc9a0105 100644
--- a/sys/dev/axgbe/xgbe-sysctl.c
+++ b/sys/dev/axgbe/xgbe-sysctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Advanced Micro Devices, Inc.
*
diff --git a/sys/dev/axgbe/xgbe-txrx.c b/sys/dev/axgbe/xgbe-txrx.c
index e798bfa37335..627a62a16992 100644
--- a/sys/dev/axgbe/xgbe-txrx.c
+++ b/sys/dev/axgbe/xgbe-txrx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Advanced Micro Devices, Inc.
*
diff --git a/sys/dev/axgbe/xgbe_osdep.c b/sys/dev/axgbe/xgbe_osdep.c
index fae47fcfcba2..2b4a133bab98 100644
--- a/sys/dev/axgbe/xgbe_osdep.c
+++ b/sys/dev/axgbe/xgbe_osdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Advanced Micro Devices, Inc.
*
diff --git a/sys/dev/axgbe/xgbe_osdep.h b/sys/dev/axgbe/xgbe_osdep.h
index b9863bbd756d..f9cab6df2127 100644
--- a/sys/dev/axgbe/xgbe_osdep.h
+++ b/sys/dev/axgbe/xgbe_osdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016,2017 SoftIron Inc.
* Copyright (c) 2020 Advanced Micro Devices, Inc.
diff --git a/sys/dev/backlight/backlight.c b/sys/dev/backlight/backlight.c
index 2d3fe02d33e9..f27297e33b87 100644
--- a/sys/dev/backlight/backlight.c
+++ b/sys/dev/backlight/backlight.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/backlight/backlight.h b/sys/dev/backlight/backlight.h
index 571b3fc6be4e..b70d8a69071c 100644
--- a/sys/dev/backlight/backlight.h
+++ b/sys/dev/backlight/backlight.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/backlight/backlight_if.m b/sys/dev/backlight/backlight_if.m
index 449032245629..21a2b34af1dd 100644
--- a/sys/dev/backlight/backlight_if.m
+++ b/sys/dev/backlight/backlight_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
#
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index 09d259e841a7..ab42f44027c4 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Stuart Walsh<stu@ipng.org.uk>
* and Duncan Barclay<dmlb@dmlb.org>
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index 8638f78cf562..e6ed3b3c8b23 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Stuart Walsh
*
diff --git a/sys/dev/bhnd/bcma/bcma.c b/sys/dev/bhnd/bcma/bcma.c
index 5ae6db1fbca6..6529e5b70daf 100644
--- a/sys/dev/bhnd/bcma/bcma.c
+++ b/sys/dev/bhnd/bcma/bcma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bcma/bcma.h b/sys/dev/bhnd/bcma/bcma.h
index 55f73971cb36..24d9c9652c10 100644
--- a/sys/dev/bhnd/bcma/bcma.h
+++ b/sys/dev/bhnd/bcma/bcma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/bcma/bcma_bhndb.c b/sys/dev/bhnd/bcma/bcma_bhndb.c
index b0f2ca4a8c04..2f5e10ddff9d 100644
--- a/sys/dev/bhnd/bcma/bcma_bhndb.c
+++ b/sys/dev/bhnd/bcma/bcma_bhndb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/bcma/bcma_erom.c b/sys/dev/bhnd/bcma/bcma_erom.c
index 14abc49f147a..5b49899f81fa 100644
--- a/sys/dev/bhnd/bcma/bcma_erom.c
+++ b/sys/dev/bhnd/bcma/bcma_erom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2017 Landon Fuller <landonf@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bcma/bcma_eromvar.h b/sys/dev/bhnd/bcma/bcma_eromvar.h
index f1c2a9396923..5a64ccc93e29 100644
--- a/sys/dev/bhnd/bcma/bcma_eromvar.h
+++ b/sys/dev/bhnd/bcma/bcma_eromvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/bcma/bcma_subr.c b/sys/dev/bhnd/bcma/bcma_subr.c
index 4b2d9884dd34..868dd67b3186 100644
--- a/sys/dev/bhnd/bcma/bcma_subr.c
+++ b/sys/dev/bhnd/bcma/bcma_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bcma/bcmavar.h b/sys/dev/bhnd/bcma/bcmavar.h
index 2527d3fbd992..4789757186aa 100644
--- a/sys/dev/bhnd/bcma/bcmavar.h
+++ b/sys/dev/bhnd/bcma/bcmavar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhnd.c b/sys/dev/bhnd/bhnd.c
index 683fd662bcdc..d33de77d5352 100644
--- a/sys/dev/bhnd/bhnd.c
+++ b/sys/dev/bhnd/bhnd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h
index 6994889f83fd..502e586074b3 100644
--- a/sys/dev/bhnd/bhnd.h
+++ b/sys/dev/bhnd/bhnd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhnd_debug.h b/sys/dev/bhnd/bhnd_debug.h
index 061f16d4d432..3cdf2775e5f0 100644
--- a/sys/dev/bhnd/bhnd_debug.h
+++ b/sys/dev/bhnd/bhnd_debug.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_erom.c b/sys/dev/bhnd/bhnd_erom.c
index d45e3efe88ac..fa9c9f2c9141 100644
--- a/sys/dev/bhnd/bhnd_erom.c
+++ b/sys/dev/bhnd/bhnd_erom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhnd_erom.h b/sys/dev/bhnd/bhnd_erom.h
index b9df81098058..96728e740d54 100644
--- a/sys/dev/bhnd/bhnd_erom.h
+++ b/sys/dev/bhnd/bhnd_erom.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2017 Landon Fuller <landonf@FreeBSD.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhnd_erom_types.h b/sys/dev/bhnd/bhnd_erom_types.h
index 37061107dda4..5f5dd689e966 100644
--- a/sys/dev/bhnd/bhnd_erom_types.h
+++ b/sys/dev/bhnd/bhnd_erom_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_eromvar.h b/sys/dev/bhnd/bhnd_eromvar.h
index dbfed9f520ed..b7407d52f91e 100644
--- a/sys/dev/bhnd/bhnd_eromvar.h
+++ b/sys/dev/bhnd/bhnd_eromvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 The FreeBSD Foundation
*
diff --git a/sys/dev/bhnd/bhnd_match.h b/sys/dev/bhnd/bhnd_match.h
index 572c38966530..404faac78986 100644
--- a/sys/dev/bhnd/bhnd_match.h
+++ b/sys/dev/bhnd/bhnd_match.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/bhnd_private.h b/sys/dev/bhnd/bhnd_private.h
index 224ea67a0b76..ac312a84e64c 100644
--- a/sys/dev/bhnd/bhnd_private.h
+++ b/sys/dev/bhnd/bhnd_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 The FreeBSD Foundation
*
diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c
index 036c3def5817..c7df98a74be4 100644
--- a/sys/dev/bhnd/bhnd_subr.c
+++ b/sys/dev/bhnd/bhnd_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhnd_types.h b/sys/dev/bhnd/bhnd_types.h
index 34cf23030005..aef63831194a 100644
--- a/sys/dev/bhnd/bhnd_types.h
+++ b/sys/dev/bhnd/bhnd_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/bhndvar.h b/sys/dev/bhnd/bhndvar.h
index eb9f77e35ef2..1033079512da 100644
--- a/sys/dev/bhnd/bhndvar.h
+++ b/sys/dev/bhnd/bhndvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
index d04702c10f97..68a778a3b6c6 100644
--- a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
+++ b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c
index 0e1c36a7c9da..6e552a5a4641 100644
--- a/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c
+++ b/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c
index 75876fe17a4c..e32f39627136 100644
--- a/sys/dev/bhnd/cores/chipc/chipc.c
+++ b/sys/dev/bhnd/cores/chipc/chipc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
diff --git a/sys/dev/bhnd/cores/chipc/chipc.h b/sys/dev/bhnd/cores/chipc/chipc.h
index f9bc2f83fe91..47231e802d79 100644
--- a/sys/dev/bhnd/cores/chipc/chipc.h
+++ b/sys/dev/bhnd/cores/chipc/chipc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_cfi.c b/sys/dev/bhnd/cores/chipc/chipc_cfi.c
index 0602893d9027..90a8db4857a8 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_cfi.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_cfi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpio.c b/sys/dev/bhnd/cores/chipc/chipc_gpio.c
index 7c75259c226f..77bf48c777fd 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_gpio.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 The FreeBSD Foundation
*
diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h b/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
index c4bbcdf47688..57310c0ead48 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_gpiovar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 The FreeBSD Foundation
*
diff --git a/sys/dev/bhnd/cores/chipc/chipc_private.h b/sys/dev/bhnd/cores/chipc/chipc_private.h
index 8a8079d590c1..da0010d32805 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_private.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/chipc/chipc_slicer.c b/sys/dev/bhnd/cores/chipc/chipc_slicer.c
index 8666e13dc3a3..cfe8dc44119c 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_slicer.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_slicer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_slicer.h b/sys/dev/bhnd/cores/chipc/chipc_slicer.h
index 077f0256b26b..93818f02015e 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_slicer.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_slicer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.c b/sys/dev/bhnd/cores/chipc/chipc_spi.c
index 045015da01aa..2b573b96ea27 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_spi.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_spi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.h b/sys/dev/bhnd/cores/chipc/chipc_spi.h
index 9424a0287872..11afa67836b4 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_spi.h
+++ b/sys/dev/bhnd/cores/chipc/chipc_spi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/chipc/chipc_subr.c b/sys/dev/bhnd/cores/chipc/chipc_subr.c
index 03c9851d73e1..1b3f4781c1a1 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_subr.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
diff --git a/sys/dev/bhnd/cores/chipc/chipcvar.h b/sys/dev/bhnd/cores/chipc/chipcvar.h
index a7ae1259aa4d..df63b0e89d32 100644
--- a/sys/dev/bhnd/cores/chipc/chipcvar.h
+++ b/sys/dev/bhnd/cores/chipc/chipcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci.c b/sys/dev/bhnd/cores/pci/bhnd_pci.c
index 482c4c5c50c6..d1ef440bdf49 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci.c
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c b/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
index 0e2786f6af12..10438bf56ab7 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h b/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
index 679d1ef7f43d..387a4dab7e04 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcib.c b/sys/dev/bhnd/cores/pci/bhnd_pcib.c
index 432414736f73..815f7249c1f4 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcib.c
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h b/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
index 5faddf8562f7..79cd2246a827 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcibvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pci/bhnd_pcivar.h b/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
index 4125b3742718..ccacd17649fa 100644
--- a/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
+++ b/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
index b914a68c81c9..164d7cae742e 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
index 0c8419d48fc6..483077522da2 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
index ecd2ae4a5f5b..7ce0d73ac637 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
index b7622e38329d..55f8a3871035 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c
index 807d1740985f..e4e7b4bd4228 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
index 1170b62ef637..ef3109e6d4d5 100644
--- a/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
+++ b/sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
index c3676ae08115..bdf87877afd8 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
index 971468c9398f..2523c0ab51f6 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
* Copyright (c) 2017 The FreeBSD Foundation
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c b/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
index 5a991d0cd942..d1cf2135e6d6 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h b/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h
index 48f54f235d80..b24c0bd76e29 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmu_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 The FreeBSD Foundation
*
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h b/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
index 6a9ab0de68f8..8d5e60ce7671 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landon@landonf.org>
* Copyright (c) 2010 Broadcom Corporation
diff --git a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
index 1bc0ff729e18..7b7c391c1f1b 100644
--- a/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
+++ b/sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Landon Fuller <landon@landonf.org>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/usb/bhnd_usb.c b/sys/dev/bhnd/cores/usb/bhnd_usb.c
index 98f75d922460..29a68efa9d80 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_usb.c
+++ b/sys/dev/bhnd/cores/usb/bhnd_usb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
* All rights reserved.
diff --git a/sys/dev/bhnd/cores/usb/bhnd_usbvar.h b/sys/dev/bhnd/cores/usb/bhnd_usbvar.h
index 493fca24ed89..7dc746a978e6 100644
--- a/sys/dev/bhnd/cores/usb/bhnd_usbvar.h
+++ b/sys/dev/bhnd/cores/usb/bhnd_usbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Aleksandr Rybalko <ray@ddteam.net>
* All rights reserved.
diff --git a/sys/dev/bhnd/siba/siba_eromvar.h b/sys/dev/bhnd/siba/siba_eromvar.h
index fa0f60011a02..9ae6a4b4cb0d 100644
--- a/sys/dev/bhnd/siba/siba_eromvar.h
+++ b/sys/dev/bhnd/siba/siba_eromvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Landon Fuller <landonf@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/bwi/if_bwi_pci.c b/sys/dev/bwi/if_bwi_pci.c
index d82b7d4d60de..2b8a408a553c 100644
--- a/sys/dev/bwi/if_bwi_pci.c
+++ b/sys/dev/bwi/if_bwi_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index ecec524c07d4..e952dfeeb24f 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c
index 51ff56184f8a..f94931b05281 100644
--- a/sys/dev/bwn/if_bwn_pci.c
+++ b/sys/dev/bwn/if_bwn_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/bwn/if_bwn_pcivar.h b/sys/dev/bwn/if_bwn_pcivar.h
index 2b134de07e26..6f9c2fb9af99 100644
--- a/sys/dev/bwn/if_bwn_pcivar.h
+++ b/sys/dev/bwn/if_bwn_pcivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/bwn/if_bwnreg.h b/sys/dev/bwn/if_bwnreg.h
index 87bc4cb021c8..08e8ac4d816c 100644
--- a/sys/dev/bwn/if_bwnreg.h
+++ b/sys/dev/bwn/if_bwnreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/bwn/if_bwnvar.h b/sys/dev/bwn/if_bwnvar.h
index 42930c20377a..aa6198b14adb 100644
--- a/sys/dev/bwn/if_bwnvar.h
+++ b/sys/dev/bwn/if_bwnvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index 948e1c6b6c69..3a0bd8754bc9 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2014 Thomas Skibo <thomasskibo@yahoo.com>
* All rights reserved.
diff --git a/sys/dev/cadence/if_cgem_hw.h b/sys/dev/cadence/if_cgem_hw.h
index afba8f7dfcd7..86e8feda69f2 100644
--- a/sys/dev/cadence/if_cgem_hw.h
+++ b/sys/dev/cadence/if_cgem_hw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 Thomas Skibo
* All rights reserved.
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 6145ad8cebb1..b1dd6a7acb48 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen. All rights reserved.
* Copyright (c) 2003-2008 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index f673117769d1..69796d34b5f3 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen All rights reserved.
* Copyright (c) 2005-2008 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index 69020ab8c650..37256ad15563 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/cardbus/cardbus_device.c b/sys/dev/cardbus/cardbus_device.c
index 0de25572fa9c..4b95fac5d414 100644
--- a/sys/dev/cardbus/cardbus_device.c
+++ b/sys/dev/cardbus/cardbus_device.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index 34ea6bd5f1f3..07968cf3df24 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index a8aa8f0aa576..aa821163d219 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen. All rights reserved.
* Copyright (c) 2008 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 653448eea405..d1bdd6e70700 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2001-2003 Thomas Moestl
diff --git a/sys/dev/cas/if_casreg.h b/sys/dev/cas/if_casreg.h
index fda2e13b6789..12b896546a4b 100644
--- a/sys/dev/cas/if_casreg.h
+++ b/sys/dev/cas/if_casreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2008 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/cas/if_casvar.h b/sys/dev/cas/if_casvar.h
index 98a7bed3336d..2e06ec4c76ea 100644
--- a/sys/dev/cas/if_casvar.h
+++ b/sys/dev/cas/if_casvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Eduardo Horvath.
* Copyright (c) 2008 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c
index 50f8fb0e2d9d..5b7cfadba3f4 100644
--- a/sys/dev/cesa/cesa.c
+++ b/sys/dev/cesa/cesa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009-2011 Semihalf.
* All rights reserved.
diff --git a/sys/dev/cesa/cesa.h b/sys/dev/cesa/cesa.h
index 449f4ecce5b2..1efbdd527db2 100644
--- a/sys/dev/cesa/cesa.h
+++ b/sys/dev/cesa/cesa.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009-2011 Semihalf.
* All rights reserved.
diff --git a/sys/dev/cfe/cfe_console.c b/sys/dev/cfe/cfe_console.c
index d8d74b9a2b83..7a3e516a4233 100644
--- a/sys/dev/cfe/cfe_console.c
+++ b/sys/dev/cfe/cfe_console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
diff --git a/sys/dev/cfe/cfe_env.c b/sys/dev/cfe/cfe_env.c
index 589f751b85d5..5d34182797da 100644
--- a/sys/dev/cfe/cfe_env.c
+++ b/sys/dev/cfe/cfe_env.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
diff --git a/sys/dev/cfe/cfe_resource.c b/sys/dev/cfe/cfe_resource.c
index 4c07d4e4d2ad..b2a95482f24b 100644
--- a/sys/dev/cfe/cfe_resource.c
+++ b/sys/dev/cfe/cfe_resource.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
diff --git a/sys/dev/cfi/cfi_bus_nexus.c b/sys/dev/cfi/cfi_bus_nexus.c
index 1c2607aadf91..cb590a4c2fc9 100644
--- a/sys/dev/cfi/cfi_bus_nexus.c
+++ b/sys/dev/cfi/cfi_bus_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 SRI International
* Copyright (c) 2009 Roelof Jonkman, Carlson Wireless Inc.
diff --git a/sys/dev/cfi/cfi_disk.c b/sys/dev/cfi/cfi_disk.c
index 5e55f79532dd..0c9c83637ca3 100644
--- a/sys/dev/cfi/cfi_disk.c
+++ b/sys/dev/cfi/cfi_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* Copyright (c) 2012-2013, SRI International
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index d87f32610b20..9665f7965ba8 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Michael Smith
* Copyright (c) 2004 Paul Saab
diff --git a/sys/dev/ciss/cissio.h b/sys/dev/ciss/cissio.h
index 149ae3fe364a..270404c028e9 100644
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Michael Smith
* All rights reserved.
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index e6c848cfa72a..f08b5cda0abb 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Michael Smith
* All rights reserved.
diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h
index b3a4155b8930..69b10079e9f3 100644
--- a/sys/dev/ciss/cissvar.h
+++ b/sys/dev/ciss/cissvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Michael Smith
* All rights reserved.
diff --git a/sys/dev/coretemp/coretemp.c b/sys/dev/coretemp/coretemp.c
index 251fb08b4c11..d656c8524400 100644
--- a/sys/dev/coretemp/coretemp.c
+++ b/sys/dev/coretemp/coretemp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/cpuctl/cpuctl.c b/sys/dev/cpuctl/cpuctl.c
index b24c25444014..c8b87b77ca07 100644
--- a/sys/dev/cpuctl/cpuctl.c
+++ b/sys/dev/cpuctl/cpuctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2008 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index 3d0c09e06640..2a5f7d72160a 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Nate Lawson (SDG)
* All rights reserved.
diff --git a/sys/dev/cxgb/bin2h.pl b/sys/dev/cxgb/bin2h.pl
index 3bdaa3437bfb..83ad3028c9a1 100644
--- a/sys/dev/cxgb/bin2h.pl
+++ b/sys/dev/cxgb/bin2h.pl
@@ -22,7 +22,7 @@ unless ($success) {
my $license = <<END;
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_ael1002.c b/sys/dev/cxgb/common/cxgb_ael1002.c
index 33814cf4285b..d896e6d64f33 100644
--- a/sys/dev/cxgb/common/cxgb_ael1002.c
+++ b/sys/dev/cxgb/common/cxgb_ael1002.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_aq100x.c b/sys/dev/cxgb/common/cxgb_aq100x.c
index 8c06f9f5ab20..417b163b1c3e 100644
--- a/sys/dev/cxgb/common/cxgb_aq100x.c
+++ b/sys/dev/cxgb/common/cxgb_aq100x.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2009 Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h
index 0e95eecc5931..4b08553f587f 100644
--- a/sys/dev/cxgb/common/cxgb_common.h
+++ b/sys/dev/cxgb/common/cxgb_common.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_firmware_exports.h b/sys/dev/cxgb/common/cxgb_firmware_exports.h
index 677ac0df998f..207787d59186 100644
--- a/sys/dev/cxgb/common/cxgb_firmware_exports.h
+++ b/sys/dev/cxgb/common/cxgb_firmware_exports.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_mc5.c b/sys/dev/cxgb/common/cxgb_mc5.c
index 54960ca23e50..fee993f71291 100644
--- a/sys/dev/cxgb/common/cxgb_mc5.c
+++ b/sys/dev/cxgb/common/cxgb_mc5.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
index c905f1c0fc3e..34e5cc4b0297 100644
--- a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
+++ b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_regs.h b/sys/dev/cxgb/common/cxgb_regs.h
index ab809b47d93a..1941efbaa08b 100644
--- a/sys/dev/cxgb/common/cxgb_regs.h
+++ b/sys/dev/cxgb/common/cxgb_regs.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_sge_defs.h b/sys/dev/cxgb/common/cxgb_sge_defs.h
index e03b73bf8341..6b8781586f17 100644
--- a/sys/dev/cxgb/common/cxgb_sge_defs.h
+++ b/sys/dev/cxgb/common/cxgb_sge_defs.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_t3_cpl.h b/sys/dev/cxgb/common/cxgb_t3_cpl.h
index 8b9ce796217f..4e2f4452efd0 100644
--- a/sys/dev/cxgb/common/cxgb_t3_cpl.h
+++ b/sys/dev/cxgb/common/cxgb_t3_cpl.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009 Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_t3_hw.c b/sys/dev/cxgb/common/cxgb_t3_hw.c
index 71893231f457..ffe38ebce1b4 100644
--- a/sys/dev/cxgb/common/cxgb_t3_hw.c
+++ b/sys/dev/cxgb/common/cxgb_t3_hw.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_tcb.h b/sys/dev/cxgb/common/cxgb_tcb.h
index ebd02beb1b3d..196708b0ea6d 100644
--- a/sys/dev/cxgb/common/cxgb_tcb.h
+++ b/sys/dev/cxgb/common/cxgb_tcb.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_tn1010.c b/sys/dev/cxgb/common/cxgb_tn1010.c
index a4ec3c74dd05..cfaffa757cf3 100644
--- a/sys/dev/cxgb/common/cxgb_tn1010.c
+++ b/sys/dev/cxgb/common/cxgb_tn1010.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_vsc7323.c b/sys/dev/cxgb/common/cxgb_vsc7323.c
index 22926b77fda2..4498d161ce63 100644
--- a/sys/dev/cxgb/common/cxgb_vsc7323.c
+++ b/sys/dev/cxgb/common/cxgb_vsc7323.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_vsc8211.c b/sys/dev/cxgb/common/cxgb_vsc8211.c
index 5d3c551e0a4f..f5c1753dc4c0 100644
--- a/sys/dev/cxgb/common/cxgb_vsc8211.c
+++ b/sys/dev/cxgb/common/cxgb_vsc8211.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/common/cxgb_xgmac.c b/sys/dev/cxgb/common/cxgb_xgmac.c
index 1df50fa873e9..9a34f29641c3 100644
--- a/sys/dev/cxgb/common/cxgb_xgmac.c
+++ b/sys/dev/cxgb/common/cxgb_xgmac.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009 Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index ae5fa9f357c8..f5949e2bc0dc 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_ioctl.h b/sys/dev/cxgb/cxgb_ioctl.h
index e4db0ee0453e..68b936f69916 100644
--- a/sys/dev/cxgb/cxgb_ioctl.h
+++ b/sys/dev/cxgb/cxgb_ioctl.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 5c0bdd569fab..28ea060abcd5 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h
index d3733752f530..548065b56d60 100644
--- a/sys/dev/cxgb/cxgb_offload.h
+++ b/sys/dev/cxgb/cxgb_offload.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h
index e3f745fee020..0f0e56cef1c0 100644
--- a/sys/dev/cxgb/cxgb_osdep.h
+++ b/sys/dev/cxgb/cxgb_osdep.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index bf3a5528a61e..95288c41c370 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/cxgb_t3fw.h b/sys/dev/cxgb/cxgb_t3fw.h
index f5e5d949407c..5a4c036605db 100644
--- a/sys/dev/cxgb/cxgb_t3fw.h
+++ b/sys/dev/cxgb/cxgb_t3fw.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/sys/mvec.h b/sys/dev/cxgb/sys/mvec.h
index 4989bff29ec4..10c9b7ae164a 100644
--- a/sys/dev/cxgb/sys/mvec.h
+++ b/sys/dev/cxgb/sys/mvec.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2009 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index 2ee01324f1da..f77bdccfcc69 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/cxgb/t3b_protocol_sram.h b/sys/dev/cxgb/t3b_protocol_sram.h
index 65936a0cbf5e..1db209e0137e 100644
--- a/sys/dev/cxgb/t3b_protocol_sram.h
+++ b/sys/dev/cxgb/t3b_protocol_sram.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/t3b_tp_eeprom.h b/sys/dev/cxgb/t3b_tp_eeprom.h
index e073dee31575..8b68c80f4d92 100644
--- a/sys/dev/cxgb/t3b_tp_eeprom.h
+++ b/sys/dev/cxgb/t3b_tp_eeprom.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/t3c_protocol_sram.h b/sys/dev/cxgb/t3c_protocol_sram.h
index 43a11d8b1559..542fc22b3e5a 100644
--- a/sys/dev/cxgb/t3c_protocol_sram.h
+++ b/sys/dev/cxgb/t3c_protocol_sram.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgb/t3c_tp_eeprom.h b/sys/dev/cxgb/t3c_tp_eeprom.h
index bbb322d7d44d..c0224f850c7d 100644
--- a/sys/dev/cxgb/t3c_tp_eeprom.h
+++ b/sys/dev/cxgb/t3c_tp_eeprom.h
@@ -1,5 +1,5 @@
/**************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2007-2009, Chelsio Inc.
All rights reserved.
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 7de1913840a1..c8f76e725a32 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h
index 7151c53d3b0f..8491db21175c 100644
--- a/sys/dev/cxgbe/common/common.h
+++ b/sys/dev/cxgbe/common/common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index 75797199e1cf..c5cb93839789 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2016 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/t4_hw.h b/sys/dev/cxgbe/common/t4_hw.h
index c0625b752962..a92dfacf1718 100644
--- a/sys/dev/cxgbe/common/t4_hw.h
+++ b/sys/dev/cxgbe/common/t4_hw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/t4_msg.h b/sys/dev/cxgbe/common/t4_msg.h
index 143cec216423..cf97fd3967ff 100644
--- a/sys/dev/cxgbe/common/t4_msg.h
+++ b/sys/dev/cxgbe/common/t4_msg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/t4_regs.h b/sys/dev/cxgbe/common/t4_regs.h
index 4a23ad360cf2..fb315ac9d980 100644
--- a/sys/dev/cxgbe/common/t4_regs.h
+++ b/sys/dev/cxgbe/common/t4_regs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, 2016 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/t4_regs_values.h b/sys/dev/cxgbe/common/t4_regs_values.h
index 2f8c34957fa3..1851962567a3 100644
--- a/sys/dev/cxgbe/common/t4_regs_values.h
+++ b/sys/dev/cxgbe/common/t4_regs_values.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/common/t4_tcb.h b/sys/dev/cxgbe/common/t4_tcb.h
index 5cbd2c941734..ac29397543fa 100644
--- a/sys/dev/cxgbe/common/t4_tcb.h
+++ b/sys/dev/cxgbe/common/t4_tcb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, 2016 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/crypto/t6_kern_tls.c b/sys/dev/cxgbe/crypto/t6_kern_tls.c
index f34da07903c8..8730f4f323a1 100644
--- a/sys/dev/cxgbe/crypto/t6_kern_tls.c
+++ b/sys/dev/cxgbe/crypto/t6_kern_tls.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018-2019 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c
index 19ec920f48c7..cb34c98d5720 100644
--- a/sys/dev/cxgbe/iw_cxgbe/cm.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013, 2016 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/cq.c b/sys/dev/cxgbe/iw_cxgbe/cq.c
index a00114150935..ba2ed073100e 100644
--- a/sys/dev/cxgbe/iw_cxgbe/cq.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c
index 7f5bf4b86da7..0c490a8d0943 100644
--- a/sys/dev/cxgbe/iw_cxgbe/device.c
+++ b/sys/dev/cxgbe/iw_cxgbe/device.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/ev.c b/sys/dev/cxgbe/iw_cxgbe/ev.c
index 7c42354644e0..b8ca65a8be4b 100644
--- a/sys/dev/cxgbe/iw_cxgbe/ev.c
+++ b/sys/dev/cxgbe/iw_cxgbe/ev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/id_table.c b/sys/dev/cxgbe/iw_cxgbe/id_table.c
index 64ffdedf7ba5..5ca64c1f8325 100644
--- a/sys/dev/cxgbe/iw_cxgbe/id_table.c
+++ b/sys/dev/cxgbe/iw_cxgbe/id_table.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Chelsio Communications. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
index 59ca38a96004..65948ec0ecc2 100644
--- a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
+++ b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013, 2016 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/mem.c b/sys/dev/cxgbe/iw_cxgbe/mem.c
index 35b9f6f20088..7ad348b90410 100644
--- a/sys/dev/cxgbe/iw_cxgbe/mem.c
+++ b/sys/dev/cxgbe/iw_cxgbe/mem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/provider.c b/sys/dev/cxgbe/iw_cxgbe/provider.c
index 02a32fa4c1fc..a7ad27905bc3 100644
--- a/sys/dev/cxgbe/iw_cxgbe/provider.c
+++ b/sys/dev/cxgbe/iw_cxgbe/provider.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013, 2016 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/qp.c b/sys/dev/cxgbe/iw_cxgbe/qp.c
index c1006109762c..fa2b5800696d 100644
--- a/sys/dev/cxgbe/iw_cxgbe/qp.c
+++ b/sys/dev/cxgbe/iw_cxgbe/qp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/resource.c b/sys/dev/cxgbe/iw_cxgbe/resource.c
index 42591f98717b..50d861dd1c39 100644
--- a/sys/dev/cxgbe/iw_cxgbe/resource.c
+++ b/sys/dev/cxgbe/iw_cxgbe/resource.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/t4.h b/sys/dev/cxgbe/iw_cxgbe/t4.h
index 88e7d6418615..f714a9427447 100644
--- a/sys/dev/cxgbe/iw_cxgbe/t4.h
+++ b/sys/dev/cxgbe/iw_cxgbe/t4.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/iw_cxgbe/user.h b/sys/dev/cxgbe/iw_cxgbe/user.h
index b3f23643a41f..cba3d7a4fb15 100644
--- a/sys/dev/cxgbe/iw_cxgbe/user.h
+++ b/sys/dev/cxgbe/iw_cxgbe/user.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013 Chelsio, Inc. All rights reserved.
*
diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h
index 81ed08f2e412..2eba2b0d885c 100644
--- a/sys/dev/cxgbe/offload.h
+++ b/sys/dev/cxgbe/offload.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/osdep.h b/sys/dev/cxgbe/osdep.h
index 3f41ccaf3d2c..1143635fa0fe 100644
--- a/sys/dev/cxgbe/osdep.h
+++ b/sys/dev/cxgbe/osdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_clip.c b/sys/dev/cxgbe/t4_clip.c
index 5f4fbd0f07a6..1d9fb72b0406 100644
--- a/sys/dev/cxgbe/t4_clip.c
+++ b/sys/dev/cxgbe/t4_clip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2021 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_clip.h b/sys/dev/cxgbe/t4_clip.h
index 9dc3d39f3266..2f154c6e8fdc 100644
--- a/sys/dev/cxgbe/t4_clip.h
+++ b/sys/dev/cxgbe/t4_clip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_filter.c b/sys/dev/cxgbe/t4_filter.c
index 3972111b4897..5eb538f96fd3 100644
--- a/sys/dev/cxgbe/t4_filter.c
+++ b/sys/dev/cxgbe/t4_filter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_ioctl.h b/sys/dev/cxgbe/t4_ioctl.h
index 3ef03f7c526c..dcce7ab9b357 100644
--- a/sys/dev/cxgbe/t4_ioctl.h
+++ b/sys/dev/cxgbe/t4_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c
index 47c995932a21..80a3d67c91c2 100644
--- a/sys/dev/cxgbe/t4_l2t.c
+++ b/sys/dev/cxgbe/t4_l2t.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_l2t.h b/sys/dev/cxgbe/t4_l2t.h
index 19b738752c2d..1a9f258637ce 100644
--- a/sys/dev/cxgbe/t4_l2t.h
+++ b/sys/dev/cxgbe/t4_l2t.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 9f4ffba9b3ef..55ea825b66b9 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 4a11c6c89573..6eff50d51c85 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_smt.c b/sys/dev/cxgbe/t4_smt.c
index 6de64ec04077..43df0b3af12b 100644
--- a/sys/dev/cxgbe/t4_smt.c
+++ b/sys/dev/cxgbe/t4_smt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_smt.h b/sys/dev/cxgbe/t4_smt.h
index 59c8e0ef1c4f..0d92df008b7c 100644
--- a/sys/dev/cxgbe/t4_smt.h
+++ b/sys/dev/cxgbe/t4_smt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/t4_tracer.c b/sys/dev/cxgbe/t4_tracer.c
index c4d6f9d48fbc..df017083739e 100644
--- a/sys/dev/cxgbe/t4_tracer.c
+++ b/sys/dev/cxgbe/t4_tracer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_connect.c b/sys/dev/cxgbe/tom/t4_connect.c
index 2ba27d62686f..00cf58912102 100644
--- a/sys/dev/cxgbe/tom/t4_connect.c
+++ b/sys/dev/cxgbe/tom/t4_connect.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index 601692cbcd76..6d6ca687bc7a 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2015 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c
index 05bb903a28aa..cc403c2fac34 100644
--- a/sys/dev/cxgbe/tom/t4_ddp.c
+++ b/sys/dev/cxgbe/tom/t4_ddp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c
index bc399c86d60a..7b708463d377 100644
--- a/sys/dev/cxgbe/tom/t4_listen.c
+++ b/sys/dev/cxgbe/tom/t4_listen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c
index a372015d4e10..a8f4cc415144 100644
--- a/sys/dev/cxgbe/tom/t4_tls.c
+++ b/sys/dev/cxgbe/tom/t4_tls.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017-2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_tls.h b/sys/dev/cxgbe/tom/t4_tls.h
index 51bf566091e7..47198bcb4aa4 100644
--- a/sys/dev/cxgbe/tom/t4_tls.h
+++ b/sys/dev/cxgbe/tom/t4_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017-2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
index 0fbcde5e0b57..a3dbacd97e25 100644
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h
index 4040b556f60e..077c715bfcee 100644
--- a/sys/dev/cxgbe/tom/t4_tom.h
+++ b/sys/dev/cxgbe/tom/t4_tom.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2015 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c
index 1d094c30d25e..0e68a0a4d14e 100644
--- a/sys/dev/cxgbe/tom/t4_tom_l2t.c
+++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.h b/sys/dev/cxgbe/tom/t4_tom_l2t.h
index dc8e04d8d978..c6e26245a55e 100644
--- a/sys/dev/cxgbe/tom/t4_tom_l2t.h
+++ b/sys/dev/cxgbe/tom/t4_tom_l2t.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/drm2/drm_gem.c b/sys/dev/drm2/drm_gem.c
index 7cfe09e46c01..3e114080514d 100644
--- a/sys/dev/drm2/drm_gem.c
+++ b/sys/dev/drm2/drm_gem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/dev/drm2/drm_gem_names.c b/sys/dev/drm2/drm_gem_names.c
index 58dbc5a26c8f..16be6bf575a0 100644
--- a/sys/dev/drm2/drm_gem_names.c
+++ b/sys/dev/drm2/drm_gem_names.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/dev/drm2/drm_gem_names.h b/sys/dev/drm2/drm_gem_names.h
index dad66f6ef9a6..5112760be5f6 100644
--- a/sys/dev/drm2/drm_gem_names.h
+++ b/sys/dev/drm2/drm_gem_names.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/dev/drm2/drm_linux_list_sort.c b/sys/dev/drm2/drm_linux_list_sort.c
index f9a64154c796..939f3d73ed6a 100644
--- a/sys/dev/drm2/drm_linux_list_sort.c
+++ b/sys/dev/drm2/drm_linux_list_sort.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/dev/dwwdt/dwwdt.c b/sys/dev/dwwdt/dwwdt.c
index 5cc20c3c9d2f..816a9ad08e08 100644
--- a/sys/dev/dwwdt/dwwdt.c
+++ b/sys/dev/dwwdt/dwwdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 BusyTech
*
diff --git a/sys/dev/esp/esp_pci.c b/sys/dev/esp/esp_pci.c
index 1e484b29415e..f13551abce5f 100644
--- a/sys/dev/esp/esp_pci.c
+++ b/sys/dev/esp/esp_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 6068497ce76b..b5ef0414e217 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause NetBSD
*
* Copyright (c) 2004 Scott Long
* Copyright (c) 2005, 2008 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 69718c97bfc4..67af3305b8fb 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.c b/sys/dev/etherswitch/arswitch/arswitch_7240.c
index c559064fca39..2096d16c0913 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_7240.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.h b/sys/dev/etherswitch/arswitch/arswitch_7240.h
index 14fcfa5918cc..7d8181aeb353 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_7240.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8216.c b/sys/dev/etherswitch/arswitch/arswitch_8216.c
index c8b29b19d0a6..09be29f271a5 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8216.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8216.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8216.h b/sys/dev/etherswitch/arswitch/arswitch_8216.h
index 2b99552c01c5..9df5be90bf78 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8216.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8216.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8226.c b/sys/dev/etherswitch/arswitch/arswitch_8226.c
index ee9e17f67bae..162344565dbf 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8226.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8226.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8226.h b/sys/dev/etherswitch/arswitch/arswitch_8226.h
index b58b7708ad2e..12b0e4a6df07 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8226.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8226.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8316.c b/sys/dev/etherswitch/arswitch/arswitch_8316.c
index 27617a4570f2..8f0d4bbd942b 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8316.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8316.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8316.h b/sys/dev/etherswitch/arswitch/arswitch_8316.h
index 7a990a0d583a..8b7ed4512d4d 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8316.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8316.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8327.c b/sys/dev/etherswitch/arswitch/arswitch_8327.c
index 29a78cf63df4..ff0dceb4fc01 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8327.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8327.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2014 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8327.h b/sys/dev/etherswitch/arswitch/arswitch_8327.h
index 941c7d097376..e58a5b8bf944 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8327.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_8327.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.c b/sys/dev/etherswitch/arswitch/arswitch_9340.c
index f0cdf4c817b3..8b1e5c390fb5 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_9340.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.h b/sys/dev/etherswitch/arswitch/arswitch_9340.h
index a594ffaf82b5..faf5ef8c1cbb 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_9340.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2031 Adrian Chadd <adrian@FreeBSD.org>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_phy.c b/sys/dev/etherswitch/arswitch/arswitch_phy.c
index 07d3d5b88ed7..7cdd5eccd408 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_phy.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* Copyright (c) 2012 Adrian Chadd.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_phy.h b/sys/dev/etherswitch/arswitch/arswitch_phy.h
index fcfc263f3bf4..d1c342600db9 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_phy.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_phy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.c b/sys/dev/etherswitch/arswitch/arswitch_reg.c
index c9f16f21fff1..92fc75e6f228 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_reg.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_reg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.h b/sys/dev/etherswitch/arswitch/arswitch_reg.h
index b15147faa371..fc212853fbaa 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_reg.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_vlans.c b/sys/dev/etherswitch/arswitch/arswitch_vlans.c
index a9452841d66a..97f053a120c4 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_vlans.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_vlans.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/arswitch/arswitch_vlans.h b/sys/dev/etherswitch/arswitch/arswitch_vlans.h
index fa0e9b4dc572..dcee5dbac67b 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_vlans.h
+++ b/sys/dev/etherswitch/arswitch/arswitch_vlans.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/arswitch/arswitchreg.h b/sys/dev/etherswitch/arswitch/arswitchreg.h
index bfe958151a59..5f8b04dea94e 100644
--- a/sys/dev/etherswitch/arswitch/arswitchreg.h
+++ b/sys/dev/etherswitch/arswitch/arswitchreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Aleksandr Rybalko.
* All rights reserved.
diff --git a/sys/dev/etherswitch/arswitch/arswitchvar.h b/sys/dev/etherswitch/arswitch/arswitchvar.h
index ff92536358ac..500e52358bb9 100644
--- a/sys/dev/etherswitch/arswitch/arswitchvar.h
+++ b/sys/dev/etherswitch/arswitch/arswitchvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/etherswitch.c b/sys/dev/etherswitch/etherswitch.c
index 903bbc12acd3..0b859a600869 100644
--- a/sys/dev/etherswitch/etherswitch.c
+++ b/sys/dev/etherswitch/etherswitch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/ip17x/ip175c.c b/sys/dev/etherswitch/ip17x/ip175c.c
index bcf62f06dfbe..735ca0e033dc 100644
--- a/sys/dev/etherswitch/ip17x/ip175c.c
+++ b/sys/dev/etherswitch/ip17x/ip175c.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip175c.h b/sys/dev/etherswitch/ip17x/ip175c.h
index 026c09a11683..e9d10f2fc354 100644
--- a/sys/dev/etherswitch/ip17x/ip175c.h
+++ b/sys/dev/etherswitch/ip17x/ip175c.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip175d.c b/sys/dev/etherswitch/ip17x/ip175d.c
index 45ba44d58ec0..300f8a3db232 100644
--- a/sys/dev/etherswitch/ip17x/ip175d.c
+++ b/sys/dev/etherswitch/ip17x/ip175d.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip175d.h b/sys/dev/etherswitch/ip17x/ip175d.h
index 6dba68c8d3bf..457ca84ceec3 100644
--- a/sys/dev/etherswitch/ip17x/ip175d.h
+++ b/sys/dev/etherswitch/ip17x/ip175d.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c
index 53ced768b41f..48e5b325cff6 100644
--- a/sys/dev/etherswitch/ip17x/ip17x.c
+++ b/sys/dev/etherswitch/ip17x/ip17x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_phy.c b/sys/dev/etherswitch/ip17x/ip17x_phy.c
index 50cbbe5dfef7..046060211cd6 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_phy.c
+++ b/sys/dev/etherswitch/ip17x/ip17x_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_phy.h b/sys/dev/etherswitch/ip17x/ip17x_phy.h
index 3ecd18821eb9..956b2b93aa8f 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_phy.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_phy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_reg.h b/sys/dev/etherswitch/ip17x/ip17x_reg.h
index b79e0c064809..a4dae95659d0 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_reg.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_var.h b/sys/dev/etherswitch/ip17x/ip17x_var.h
index 9573a18a1875..658d1e1fe82f 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_var.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_vlans.c b/sys/dev/etherswitch/ip17x/ip17x_vlans.c
index d6b5883692d6..d3eb1ec49108 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_vlans.c
+++ b/sys/dev/etherswitch/ip17x/ip17x_vlans.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ip17x/ip17x_vlans.h b/sys/dev/etherswitch/ip17x/ip17x_vlans.h
index 5d4c0ef56887..2629a64b303f 100644
--- a/sys/dev/etherswitch/ip17x/ip17x_vlans.h
+++ b/sys/dev/etherswitch/ip17x/ip17x_vlans.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* All rights reserved.
diff --git a/sys/dev/etherswitch/miiproxy.c b/sys/dev/etherswitch/miiproxy.c
index d667cfec2c3e..7209a5b3975b 100644
--- a/sys/dev/etherswitch/miiproxy.c
+++ b/sys/dev/etherswitch/miiproxy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/miiproxy.h b/sys/dev/etherswitch/miiproxy.h
index fc30af10ada2..44b3220eb994 100644
--- a/sys/dev/etherswitch/miiproxy.h
+++ b/sys/dev/etherswitch/miiproxy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index de35e2dc62ba..4e7b716b86d9 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Hiroki Mori.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h b/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
index 471a0c732283..ec392291c82f 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Hiroki Mori.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c
index 8293db0fa571..fde2de3f7f9c 100644
--- a/sys/dev/etherswitch/ukswitch/ukswitch.c
+++ b/sys/dev/etherswitch/ukswitch/ukswitch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Luiz Otavio O Souza.
* Copyright (c) 2011-2012 Stefan Bethke.
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index e0448ba04012..889fab5120ae 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 2002-2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index ac7a064b3683..a339ee781ad9 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -2,7 +2,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index d26330b23557..ad7dab535eea 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/extres/syscon/syscon.c b/sys/dev/extres/syscon/syscon.c
index 3701c6e8fe70..24bcf5baea6e 100644
--- a/sys/dev/extres/syscon/syscon.c
+++ b/sys/dev/extres/syscon/syscon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/dev/extres/syscon/syscon.h b/sys/dev/extres/syscon/syscon.h
index cb138ed5ded5..1609e5578c30 100644
--- a/sys/dev/extres/syscon/syscon.h
+++ b/sys/dev/extres/syscon/syscon.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/dev/extres/syscon/syscon_generic.c b/sys/dev/extres/syscon/syscon_generic.c
index 12b0ca446a5c..0e7db69e7942 100644
--- a/sys/dev/extres/syscon/syscon_generic.c
+++ b/sys/dev/extres/syscon/syscon_generic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Michal Meloun
* All rights reserved.
diff --git a/sys/dev/extres/syscon/syscon_generic.h b/sys/dev/extres/syscon/syscon_generic.h
index 9d2cde87ef98..87dbbf3dcdd6 100644
--- a/sys/dev/extres/syscon/syscon_generic.h
+++ b/sys/dev/extres/syscon/syscon_generic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/dev/extres/syscon/syscon_power.c b/sys/dev/extres/syscon/syscon_power.c
index 586af0102713..94efead1cdb4 100644
--- a/sys/dev/extres/syscon/syscon_power.c
+++ b/sys/dev/extres/syscon/syscon_power.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Jessica Clarke <jrtc27@FreeBSD.org>
*
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c
index 5a77159ec4b1..073d7fd81288 100644
--- a/sys/dev/fb/fbd.c
+++ b/sys/dev/fb/fbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 7637f06a86b4..5676b4f519ac 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 37ecddbaeb43..9aca2714c414 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Alcove - Nicolas Souchu <nsouch@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index c3e1946ad0e8..5ef11f3c17a2 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index fbd7360766c0..0201f40dee9f 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@freebsd.org>
diff --git a/sys/dev/fb/splash_txt.c b/sys/dev/fb/splash_txt.c
index 1477c3bf52b4..280245e75575 100644
--- a/sys/dev/fb/splash_txt.c
+++ b/sys/dev/fb/splash_txt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@freebsd.org>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index be81e4ad7cd7..c247173bb589 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c
index f1d75873f983..a177594c9fe4 100644
--- a/sys/dev/fb/vesa.c
+++ b/sys/dev/fb/vesa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Kazutaka YOKOTA and Michael Smith
* Copyright (c) 2009-2013 Jung-uk Kim <jkim@FreeBSD.org>
diff --git a/sys/dev/fb/vesa.h b/sys/dev/fb/vesa.h
index d38af0ee645c..477377aa2165 100644
--- a/sys/dev/fb/vesa.h
+++ b/sys/dev/fb/vesa.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith and Kazutaka YOKOTA
* All rights reserved.
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index b2c148a4dd3b..b07ecb2b40ae 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c
index 6da5bf135b4a..bc00f1502070 100644
--- a/sys/dev/fdc/fdc_acpi.c
+++ b/sys/dev/fdc/fdc_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Nate Lawson (SDG)
* All rights reserved.
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index 6b22c05fb85e..58b7a4f2ed8a 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 3a2159db1348..9a8241208c67 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c
index 18ac3957f7f9..d5fa45a5f1c0 100644
--- a/sys/dev/fdt/fdt_common.c
+++ b/sys/dev/fdt/fdt_common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2014 The FreeBSD Foundation
*
diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h
index fc2990cdae29..2ed12ef16a57 100644
--- a/sys/dev/fdt/fdt_common.h
+++ b/sys/dev/fdt/fdt_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
*
diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c
index 462cb4d80fe5..ec0b5e036e6d 100644
--- a/sys/dev/fdt/fdt_slicer.c
+++ b/sys/dev/fdt/fdt_slicer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Semihalf.
* All rights reserved.
diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c
index aedada3079e8..fdfa16e70080 100644
--- a/sys/dev/fdt/simple_mfd.c
+++ b/sys/dev/fdt/simple_mfd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/dev/fdt/simple_mfd.h b/sys/dev/fdt/simple_mfd.h
index 267b254ca1fe..01c443e27cf2 100644
--- a/sys/dev/fdt/simple_mfd.h
+++ b/sys/dev/fdt/simple_mfd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
*
diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c
index a29b28f2a016..2b2fe4133191 100644
--- a/sys/dev/fdt/simplebus.c
+++ b/sys/dev/fdt/simplebus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/ffec/if_ffec.c b/sys/dev/ffec/if_ffec.c
index 090869abeba1..d04c2810da7e 100644
--- a/sys/dev/ffec/if_ffec.c
+++ b/sys/dev/ffec/if_ffec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/ffec/if_ffecreg.h b/sys/dev/ffec/if_ffecreg.h
index 00bb896f6694..e04a9d4d70bc 100644
--- a/sys/dev/ffec/if_ffecreg.h
+++ b/sys/dev/ffec/if_ffecreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c
index 4c3a23a53042..c1cd05297838 100644
--- a/sys/dev/filemon/filemon.c
+++ b/sys/dev/filemon/filemon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, David E. O'Brien.
* Copyright (c) 2009-2011, Juniper Networks, Inc.
diff --git a/sys/dev/filemon/filemon.h b/sys/dev/filemon/filemon.h
index 4a97dfd010ad..1ff722cd968f 100644
--- a/sys/dev/filemon/filemon.h
+++ b/sys/dev/filemon/filemon.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, David E. O'Brien.
* Copyright (c) 2009-2011, Juniper Networks, Inc.
diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c
index 4e64d8254f8d..13e9794110ed 100644
--- a/sys/dev/filemon/filemon_wrapper.c
+++ b/sys/dev/filemon/filemon_wrapper.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, David E. O'Brien.
* Copyright (c) 2009-2011, Juniper Networks, Inc.
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c
index 2c7402dbbe82..05af2e89c0bc 100644
--- a/sys/dev/flash/at45d.c
+++ b/sys/dev/flash/at45d.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Ian Lepore All rights reserved.
* Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org> All rights reserved.
diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c
index dfe670f73aee..261014be683b 100644
--- a/sys/dev/flash/mx25l.c
+++ b/sys/dev/flash/mx25l.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko. All rights reserved.
* Copyright (c) 2018 Ian Lepore. All rights reserved.
diff --git a/sys/dev/flash/mx25lreg.h b/sys/dev/flash/mx25lreg.h
index 62e0d4e750d8..27508f29759a 100644
--- a/sys/dev/flash/mx25lreg.h
+++ b/sys/dev/flash/mx25lreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 476a1a2c361a..ba888ed4b95c 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1995, David Greenman
* All rights reserved.
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index e742812824df..3fcfa803449d 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Henrik Brix Andersen <brix@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/glxsb/glxsb.h b/sys/dev/glxsb/glxsb.h
index 27e5bb44709c..8336d1c10413 100644
--- a/sys/dev/glxsb/glxsb.h
+++ b/sys/dev/glxsb/glxsb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/glxsb/glxsb_hash.c b/sys/dev/glxsb/glxsb_hash.c
index b9ceb27deb4d..2930c4910af5 100644
--- a/sys/dev/glxsb/glxsb_hash.c
+++ b/sys/dev/glxsb/glxsb_hash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/goldfish/goldfish_rtc.c b/sys/dev/goldfish/goldfish_rtc.c
index 081ea37bb8ef..038484f196ee 100644
--- a/sys/dev/goldfish/goldfish_rtc.c
+++ b/sys/dev/goldfish/goldfish_rtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Jessica Clarke <jrtc27@FreeBSD.org>
*
diff --git a/sys/dev/gpio/chvgpio.c b/sys/dev/gpio/chvgpio.c
index 7b8203687322..96a48d171b39 100644
--- a/sys/dev/gpio/chvgpio.c
+++ b/sys/dev/gpio/chvgpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Tom Jones <tj@enoti.me>
* All rights reserved.
diff --git a/sys/dev/gpio/chvgpio_reg.h b/sys/dev/gpio/chvgpio_reg.h
index 2c3dac09f68b..90a03f14cc1c 100644
--- a/sys/dev/gpio/chvgpio_reg.h
+++ b/sys/dev/gpio/chvgpio_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Tom Jones <tj@enoti.me>
* All rights reserved.
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index e1f74d81955e..099f32645801 100644
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h
index e83ea62bc50d..2f12fae99733 100644
--- a/sys/dev/gpio/gpiobusvar.h
+++ b/sys/dev/gpio/gpiobusvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/gpio/gpioc.c b/sys/dev/gpio/gpioc.c
index dec69b434f7a..8145822cbf76 100644
--- a/sys/dev/gpio/gpioc.c
+++ b/sys/dev/gpio/gpioc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/gpio/gpioled.c b/sys/dev/gpio/gpioled.c
index a3d686478469..43cc66357e2b 100644
--- a/sys/dev/gpio/gpioled.c
+++ b/sys/dev/gpio/gpioled.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/gpio/gpiomdio.c b/sys/dev/gpio/gpiomdio.c
index fcc33b919ed9..c875c7376c35 100644
--- a/sys/dev/gpio/gpiomdio.c
+++ b/sys/dev/gpio/gpiomdio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/dev/gpio/ofw_gpiobus.c b/sys/dev/gpio/ofw_gpiobus.c
index 5d2353b54ba3..78ff20122301 100644
--- a/sys/dev/gpio/ofw_gpiobus.c
+++ b/sys/dev/gpio/ofw_gpiobus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* Copyright (c) 2013, Luiz Otavio O Souza <loos@FreeBSD.org>
diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c
index 0a1f3593b3a7..368351dc8e2b 100644
--- a/sys/dev/gpio/pl061.c
+++ b/sys/dev/gpio/pl061.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
* All rights reserved.
diff --git a/sys/dev/gpio/pl061.h b/sys/dev/gpio/pl061.h
index d37681af6784..dd6d45042f6f 100644
--- a/sys/dev/gpio/pl061.h
+++ b/sys/dev/gpio/pl061.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
* All rights reserved.
diff --git a/sys/dev/gpio/pl061_acpi.c b/sys/dev/gpio/pl061_acpi.c
index edfd8926a936..81e69015f467 100644
--- a/sys/dev/gpio/pl061_acpi.c
+++ b/sys/dev/gpio/pl061_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
* All rights reserved.
diff --git a/sys/dev/gxemul/cons/gxemul_cons.c b/sys/dev/gxemul/cons/gxemul_cons.c
index 01c1d5d569de..02b2cb4d12cc 100644
--- a/sys/dev/gxemul/cons/gxemul_cons.c
+++ b/sys/dev/gxemul/cons/gxemul_cons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/gxemul/disk/gxemul_disk.c b/sys/dev/gxemul/disk/gxemul_disk.c
index d306e2bf53c5..81032653da09 100644
--- a/sys/dev/gxemul/disk/gxemul_disk.c
+++ b/sys/dev/gxemul/disk/gxemul_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/gxemul/disk/gxemul_diskreg.h b/sys/dev/gxemul/disk/gxemul_diskreg.h
index 8db71f1593f9..c1ad46d1c34a 100644
--- a/sys/dev/gxemul/disk/gxemul_diskreg.h
+++ b/sys/dev/gxemul/disk/gxemul_diskreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/gxemul/ether/gxreg.h b/sys/dev/gxemul/ether/gxreg.h
index 557c902befef..0d6beb7cabc8 100644
--- a/sys/dev/gxemul/ether/gxreg.h
+++ b/sys/dev/gxemul/ether/gxreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/gxemul/ether/if_gx.c b/sys/dev/gxemul/ether/if_gx.c
index 7e2493dba1a6..be69bf832dea 100644
--- a/sys/dev/gxemul/ether/if_gx.c
+++ b/sys/dev/gxemul/ether/if_gx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c
index 223ed01e8312..f07371f6ae05 100644
--- a/sys/dev/hid/bcm5974.c
+++ b/sys/dev/hid/bcm5974.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Huang Wen Hui
* Copyright (c) 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/sys/dev/hid/hconf.c b/sys/dev/hid/hconf.c
index 90cd52d3116c..b9cc2f03aa07 100644
--- a/sys/dev/hid/hconf.c
+++ b/sys/dev/hid/hconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
* Copyright (c) 2020 Andriy Gapon <avg@FreeBSD.org>
diff --git a/sys/dev/hid/hconf.h b/sys/dev/hid/hconf.h
index 2bbcbb3892b3..0b9a5a20adda 100644
--- a/sys/dev/hid/hconf.h
+++ b/sys/dev/hid/hconf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hcons.c b/sys/dev/hid/hcons.c
index 33264116bc76..9389fbdacef1 100644
--- a/sys/dev/hid/hcons.c
+++ b/sys/dev/hid/hcons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hgame.c b/sys/dev/hid/hgame.c
index 97b1ac91960c..bd25454f217d 100644
--- a/sys/dev/hid/hgame.c
+++ b/sys/dev/hid/hgame.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
* Copyright (c) 2020 Greg V <greg@unrelenting.technology>
diff --git a/sys/dev/hid/hgame.h b/sys/dev/hid/hgame.h
index 702c65a4a4c1..44a88c133024 100644
--- a/sys/dev/hid/hgame.h
+++ b/sys/dev/hid/hgame.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
* Copyright (c) 2020 Greg V <greg@unrelenting.technology>
diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c
index c10f17748e8d..756bef82c2bf 100644
--- a/sys/dev/hid/hidbus.c
+++ b/sys/dev/hid/hidbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019-2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hidmap.c b/sys/dev/hid/hidmap.c
index d787b298b41d..8951f14a2361 100644
--- a/sys/dev/hid/hidmap.c
+++ b/sys/dev/hid/hidmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hidmap.h b/sys/dev/hid/hidmap.h
index 628881092639..d57d9b966675 100644
--- a/sys/dev/hid/hidmap.h
+++ b/sys/dev/hid/hidmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hidquirk.h b/sys/dev/hid/hidquirk.h
index 5f0dafb8a8a2..2cdfccedfbb7 100644
--- a/sys/dev/hid/hidquirk.h
+++ b/sys/dev/hid/hidquirk.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/sys/dev/hid/hidraw.h b/sys/dev/hid/hidraw.h
index b1b037ab8c1b..9aaaa42d2a7c 100644
--- a/sys/dev/hid/hidraw.h
+++ b/sys/dev/hid/hidraw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hidrdesc.h b/sys/dev/hid/hidrdesc.h
index f6cbb755cd24..918073e3e735 100644
--- a/sys/dev/hid/hidrdesc.h
+++ b/sys/dev/hid/hidrdesc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Nick Hibma <n_hibma@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/hid/hms.c b/sys/dev/hid/hms.c
index 2d2b996646c2..c22cdfce9362 100644
--- a/sys/dev/hid/hms.c
+++ b/sys/dev/hid/hms.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hmt.c b/sys/dev/hid/hmt.c
index dcf360bcffba..a44a6ad66d0e 100644
--- a/sys/dev/hid/hmt.c
+++ b/sys/dev/hid/hmt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014-2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/hpen.c b/sys/dev/hid/hpen.c
index 7fed4e193016..2cd761882b1c 100644
--- a/sys/dev/hid/hpen.c
+++ b/sys/dev/hid/hpen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
* Copyright (c) 2019 Greg V <greg@unrelenting.technology>
diff --git a/sys/dev/hid/hsctrl.c b/sys/dev/hid/hsctrl.c
index 2e0a06f547ac..af04f33a9297 100644
--- a/sys/dev/hid/hsctrl.c
+++ b/sys/dev/hid/hsctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/ietp.c b/sys/dev/hid/ietp.c
index 4991922968d2..2f2e14b25f5c 100644
--- a/sys/dev/hid/ietp.c
+++ b/sys/dev/hid/ietp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020, 2022 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/ps4dshock.c b/sys/dev/hid/ps4dshock.c
index afb74bc4b843..c3470845d9aa 100644
--- a/sys/dev/hid/ps4dshock.c
+++ b/sys/dev/hid/ps4dshock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/hid/xb360gp.c b/sys/dev/hid/xb360gp.c
index f255c110f47c..3a3d747f6ec5 100644
--- a/sys/dev/hid/xb360gp.c
+++ b/sys/dev/hid/xb360gp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
* Copyright (c) 2020 Greg V <greg@unrelenting.technology>
diff --git a/sys/dev/hpt27xx/array.h b/sys/dev/hpt27xx/array.h
index f6839679a103..9a75b9ea965a 100644
--- a/sys/dev/hpt27xx/array.h
+++ b/sys/dev/hpt27xx/array.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/him.h b/sys/dev/hpt27xx/him.h
index b51529ca7453..7081375d6cbd 100644
--- a/sys/dev/hpt27xx/him.h
+++ b/sys/dev/hpt27xx/him.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/himfuncs.h b/sys/dev/hpt27xx/himfuncs.h
index 2c4396ed2e6e..a9d3f5cda61e 100644
--- a/sys/dev/hpt27xx/himfuncs.h
+++ b/sys/dev/hpt27xx/himfuncs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/hpt27xx_config.c b/sys/dev/hpt27xx/hpt27xx_config.c
index 79950a744727..87d09ab8ac9f 100644
--- a/sys/dev/hpt27xx/hpt27xx_config.c
+++ b/sys/dev/hpt27xx/hpt27xx_config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/hpt27xx_config.h b/sys/dev/hpt27xx/hpt27xx_config.h
index 4416dd181b15..a7d2cacd46e2 100644
--- a/sys/dev/hpt27xx/hpt27xx_config.h
+++ b/sys/dev/hpt27xx/hpt27xx_config.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/hpt27xx_os_bsd.c b/sys/dev/hpt27xx/hpt27xx_os_bsd.c
index 86d72c5736df..234a5b89c60e 100644
--- a/sys/dev/hpt27xx/hpt27xx_os_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_os_bsd.c
@@ -1,7 +1,7 @@
/*-
* HighPoint RAID Driver for FreeBSD
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005-2011 HighPoint Technologies, Inc. All Rights Reserved.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
index 209c859b23fd..562d2de82db0 100644
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/hptintf.h b/sys/dev/hpt27xx/hptintf.h
index ce768b846fba..b34d2b6dfc6e 100644
--- a/sys/dev/hpt27xx/hptintf.h
+++ b/sys/dev/hpt27xx/hptintf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/ldm.h b/sys/dev/hpt27xx/ldm.h
index 1ffdaaca71af..a2e7194f7f51 100644
--- a/sys/dev/hpt27xx/ldm.h
+++ b/sys/dev/hpt27xx/ldm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/list.h b/sys/dev/hpt27xx/list.h
index c05dc7f63dd0..357522ea52de 100644
--- a/sys/dev/hpt27xx/list.h
+++ b/sys/dev/hpt27xx/list.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/os_bsd.h b/sys/dev/hpt27xx/os_bsd.h
index 6ee0e5b0fd1f..c51b6304b5ca 100644
--- a/sys/dev/hpt27xx/os_bsd.h
+++ b/sys/dev/hpt27xx/os_bsd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/osm.h b/sys/dev/hpt27xx/osm.h
index 38f1daea026a..db510a80c628 100644
--- a/sys/dev/hpt27xx/osm.h
+++ b/sys/dev/hpt27xx/osm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hpt27xx/wj.h b/sys/dev/hpt27xx/wj.h
index bb47908ce0dc..1eff4ac3fa25 100644
--- a/sys/dev/hpt27xx/wj.h
+++ b/sys/dev/hpt27xx/wj.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index 4091a8fb2822..6d5473d5abd1 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* HighPoint RR3xxx/4xxx RAID Driver for FreeBSD
* Copyright (C) 2007-2012 HighPoint Technologies, Inc. All Rights Reserved.
diff --git a/sys/dev/hptiop/hptiop.h b/sys/dev/hptiop/hptiop.h
index d18a027b9660..f61d0488b004 100644
--- a/sys/dev/hptiop/hptiop.h
+++ b/sys/dev/hptiop/hptiop.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* HighPoint RR3xxx/4xxx RAID Driver for FreeBSD
* Copyright (C) 2007-2012 HighPoint Technologies, Inc. All Rights Reserved.
diff --git a/sys/dev/hptmv/access601.h b/sys/dev/hptmv/access601.h
index 0165343ae824..a11132ab51a8 100644
--- a/sys/dev/hptmv/access601.h
+++ b/sys/dev/hptmv/access601.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/array.h b/sys/dev/hptmv/array.h
index c512453ecb6a..2250c6e02e9d 100644
--- a/sys/dev/hptmv/array.h
+++ b/sys/dev/hptmv/array.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/atapi.h b/sys/dev/hptmv/atapi.h
index 622260f52f2d..2cda180d73e0 100644
--- a/sys/dev/hptmv/atapi.h
+++ b/sys/dev/hptmv/atapi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/command.h b/sys/dev/hptmv/command.h
index 7f6435aa7266..e44534dab8f4 100644
--- a/sys/dev/hptmv/command.h
+++ b/sys/dev/hptmv/command.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 7fbcb3a16571..078e5e81d747 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index a5373b37991e..31d370fa7679 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/gui_lib.c b/sys/dev/hptmv/gui_lib.c
index 927f5bd94c4c..5b468db6bb7e 100644
--- a/sys/dev/hptmv/gui_lib.c
+++ b/sys/dev/hptmv/gui_lib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index c78256923dbc..2acb55291a21 100644
--- a/sys/dev/hptmv/hptintf.h
+++ b/sys/dev/hptmv/hptintf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index 90d65250c752..85e6bcda3436 100644
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/ioctl.c b/sys/dev/hptmv/ioctl.c
index c9960b24dc52..808f42751dae 100644
--- a/sys/dev/hptmv/ioctl.c
+++ b/sys/dev/hptmv/ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index f86401ef4242..0fbaeba2dc2f 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index 8070db1a402d..28f87a465159 100644
--- a/sys/dev/hptmv/mvOs.h
+++ b/sys/dev/hptmv/mvOs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/mvSata.h b/sys/dev/hptmv/mvSata.h
index 32427c30557d..6b1bc4d490ce 100644
--- a/sys/dev/hptmv/mvSata.h
+++ b/sys/dev/hptmv/mvSata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 MARVELL SEMICONDUCTOR ISRAEL, LTD.
* All rights reserved.
diff --git a/sys/dev/hptmv/mvStorageDev.h b/sys/dev/hptmv/mvStorageDev.h
index 2d7baa3075c3..4844552bc436 100644
--- a/sys/dev/hptmv/mvStorageDev.h
+++ b/sys/dev/hptmv/mvStorageDev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 MARVELL SEMICONDUCTOR ISRAEL, LTD.
* All rights reserved.
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index f4922c8e4a0a..5c88faceba06 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/raid5n.h b/sys/dev/hptmv/raid5n.h
index ee85b60e30d3..4eb867b63439 100644
--- a/sys/dev/hptmv/raid5n.h
+++ b/sys/dev/hptmv/raid5n.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptmv/vdevice.h b/sys/dev/hptmv/vdevice.h
index acf3baf5423f..b2cdc2a70a60 100644
--- a/sys/dev/hptmv/vdevice.h
+++ b/sys/dev/hptmv/vdevice.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/array.h b/sys/dev/hptnr/array.h
index 780ab75e180d..a66b9489833f 100644
--- a/sys/dev/hptnr/array.h
+++ b/sys/dev/hptnr/array.h
@@ -1,6 +1,6 @@
/* $Id: array.h,v 1.46 2010/02/05 06:57:43 mah Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2004-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/him.h b/sys/dev/hptnr/him.h
index 21ec6d6b07f5..e1f238782177 100644
--- a/sys/dev/hptnr/him.h
+++ b/sys/dev/hptnr/him.h
@@ -1,6 +1,6 @@
/* $Id: him.h,v 1.57 2011/02/21 06:03:21 zsf Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2004-2005 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/himfuncs.h b/sys/dev/hptnr/himfuncs.h
index 38dfb5ce4763..6c401cfe9180 100644
--- a/sys/dev/hptnr/himfuncs.h
+++ b/sys/dev/hptnr/himfuncs.h
@@ -1,6 +1,6 @@
/* $Id: himfuncs.h,v 1.17 2010/05/10 10:10:02 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/hptintf.h b/sys/dev/hptnr/hptintf.h
index 208a75e1dfd3..8059d4599f5d 100644
--- a/sys/dev/hptnr/hptintf.h
+++ b/sys/dev/hptnr/hptintf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/hptnr_config.c b/sys/dev/hptnr/hptnr_config.c
index c6d0d636b2bb..d6f0fc03d435 100644
--- a/sys/dev/hptnr/hptnr_config.c
+++ b/sys/dev/hptnr/hptnr_config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/hptnr_config.h b/sys/dev/hptnr/hptnr_config.h
index 819bb599f3f6..5fc75d6af9b2 100644
--- a/sys/dev/hptnr/hptnr_config.h
+++ b/sys/dev/hptnr/hptnr_config.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/hptnr_os_bsd.c b/sys/dev/hptnr/hptnr_os_bsd.c
index 69bdf2193151..fa195dfa4c21 100644
--- a/sys/dev/hptnr/hptnr_os_bsd.c
+++ b/sys/dev/hptnr/hptnr_os_bsd.c
@@ -1,6 +1,6 @@
/* $Id: os_bsd.c,v 1.13 2010/05/11 03:12:11 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* HighPoint RAID Driver for FreeBSD
* Copyright (C) 2005-2011 HighPoint Technologies, Inc. All Rights Reserved.
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
index 8afd3e22d2e8..15d99e38e8d4 100644
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -1,6 +1,6 @@
/* $Id: osm_bsd.c,v 1.36 2010/05/11 03:12:11 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* HighPoint RAID Driver for FreeBSD
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
diff --git a/sys/dev/hptnr/ldm.h b/sys/dev/hptnr/ldm.h
index db3439220a54..3e3007723e79 100644
--- a/sys/dev/hptnr/ldm.h
+++ b/sys/dev/hptnr/ldm.h
@@ -1,6 +1,6 @@
/* $Id: ldm.h,v 1.78 2010/05/10 10:08:46 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/list.h b/sys/dev/hptnr/list.h
index 832093fe9325..92f7651d73ec 100644
--- a/sys/dev/hptnr/list.h
+++ b/sys/dev/hptnr/list.h
@@ -1,6 +1,6 @@
/* $Id: list.h,v 1.6 2006/10/31 06:25:28 gmm Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/os_bsd.h b/sys/dev/hptnr/os_bsd.h
index c1f7c8c6779c..28eecb7d1591 100644
--- a/sys/dev/hptnr/os_bsd.h
+++ b/sys/dev/hptnr/os_bsd.h
@@ -1,6 +1,6 @@
/* $Id: os_bsd.h,v 1.20 2010/05/11 03:12:11 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* HighPoint RAID Driver for FreeBSD
* Copyright (C) 2005-2011 HighPoint Technologies, Inc. All Rights Reserved.
diff --git a/sys/dev/hptnr/osm.h b/sys/dev/hptnr/osm.h
index 9b443bc9c909..a35db1ac88e4 100644
--- a/sys/dev/hptnr/osm.h
+++ b/sys/dev/hptnr/osm.h
@@ -1,6 +1,6 @@
/* $Id: osm.h,v 1.10 2010/05/11 10:30:33 lcn Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005-2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptnr/wj.h b/sys/dev/hptnr/wj.h
index 0102a60c4e8f..f54a545d9f9e 100644
--- a/sys/dev/hptnr/wj.h
+++ b/sys/dev/hptnr/wj.h
@@ -1,6 +1,6 @@
/* $Id: wj.h,v 1.1 2007/11/01 03:05:51 gmm Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/array.h b/sys/dev/hptrr/array.h
index 1e50554d25f6..3ff8ba63d8d1 100644
--- a/sys/dev/hptrr/array.h
+++ b/sys/dev/hptrr/array.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/him.h b/sys/dev/hptrr/him.h
index dc62f20f1a0b..92cde4a05dc3 100644
--- a/sys/dev/hptrr/him.h
+++ b/sys/dev/hptrr/him.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/himfuncs.h b/sys/dev/hptrr/himfuncs.h
index 32adb972243f..daa5f97851c3 100644
--- a/sys/dev/hptrr/himfuncs.h
+++ b/sys/dev/hptrr/himfuncs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/hptintf.h b/sys/dev/hptrr/hptintf.h
index 1c08d272f964..273a3e0a0712 100644
--- a/sys/dev/hptrr/hptintf.h
+++ b/sys/dev/hptrr/hptintf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/hptrr_config.c b/sys/dev/hptrr/hptrr_config.c
index e35bddb8def5..38107b6ad8be 100644
--- a/sys/dev/hptrr/hptrr_config.c
+++ b/sys/dev/hptrr/hptrr_config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/hptrr_config.h b/sys/dev/hptrr/hptrr_config.h
index c58023f93baf..23da7dba6ce8 100644
--- a/sys/dev/hptrr/hptrr_config.h
+++ b/sys/dev/hptrr/hptrr_config.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/hptrr_os_bsd.c b/sys/dev/hptrr/hptrr_os_bsd.c
index 32deb405fe42..cd5fae842955 100644
--- a/sys/dev/hptrr/hptrr_os_bsd.c
+++ b/sys/dev/hptrr/hptrr_os_bsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 3fc13f65a984..2a23537a31e2 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/ldm.h b/sys/dev/hptrr/ldm.h
index 16480237df41..3ee04dcb7864 100644
--- a/sys/dev/hptrr/ldm.h
+++ b/sys/dev/hptrr/ldm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/list.h b/sys/dev/hptrr/list.h
index 8eab0e023593..79c3053c8a1b 100644
--- a/sys/dev/hptrr/list.h
+++ b/sys/dev/hptrr/list.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h
index 232a137927cc..9f47698eff2a 100644
--- a/sys/dev/hptrr/os_bsd.h
+++ b/sys/dev/hptrr/os_bsd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hptrr/osm.h b/sys/dev/hptrr/osm.h
index 4cfd3a123d7e..4c12cb28e403 100644
--- a/sys/dev/hptrr/osm.h
+++ b/sys/dev/hptrr/osm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) HighPoint Technologies, Inc.
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
index 26ea46d3fc9f..d119946e1c3b 100644
--- a/sys/dev/hwpmc/hwpmc_amd.c
+++ b/sys/dev/hwpmc/hwpmc_amd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h
index 5dcddb9d51a4..e859df518ff9 100644
--- a/sys/dev/hwpmc/hwpmc_amd.h
+++ b/sys/dev/hwpmc/hwpmc_amd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_arm.c b/sys/dev/hwpmc/hwpmc_arm.c
index a0e2e6823219..3638b7b4214d 100644
--- a/sys/dev/hwpmc/hwpmc_arm.c
+++ b/sys/dev/hwpmc/hwpmc_arm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
index 02165898aeed..409fb8e43094 100644
--- a/sys/dev/hwpmc/hwpmc_core.c
+++ b/sys/dev/hwpmc/hwpmc_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_core.h b/sys/dev/hwpmc/hwpmc_core.h
index b75146d8b590..05dfa3e898a0 100644
--- a/sys/dev/hwpmc/hwpmc_core.h
+++ b/sys/dev/hwpmc/hwpmc_core.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c
index c51e74f34516..a9c0a06d82ba 100644
--- a/sys/dev/hwpmc/hwpmc_intel.c
+++ b/sys/dev/hwpmc/hwpmc_intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c
index e0ff87619137..02f2c1c383e2 100644
--- a/sys/dev/hwpmc/hwpmc_logging.c
+++ b/sys/dev/hwpmc/hwpmc_logging.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/dev/hwpmc/hwpmc_mips.c b/sys/dev/hwpmc/hwpmc_mips.c
index cf9550b4cbc9..6b202e32c2ec 100644
--- a/sys/dev/hwpmc/hwpmc_mips.c
+++ b/sys/dev/hwpmc/hwpmc_mips.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, George V. Neville-Neil <gnn@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_mips24k.c b/sys/dev/hwpmc/hwpmc_mips24k.c
index 7a87902a39ea..ec4b60fbd073 100644
--- a/sys/dev/hwpmc/hwpmc_mips24k.c
+++ b/sys/dev/hwpmc/hwpmc_mips24k.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 George V. Neville-Neil <gnn@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index 571b403538ed..d98345b14ccd 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/dev/hwpmc/hwpmc_mpc7xxx.c b/sys/dev/hwpmc/hwpmc_mpc7xxx.c
index c62c0791af01..7cb684ddd30d 100644
--- a/sys/dev/hwpmc/hwpmc_mpc7xxx.c
+++ b/sys/dev/hwpmc/hwpmc_mpc7xxx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Justin Hibbits
* Copyright (c) 2005, Joseph Koshy
diff --git a/sys/dev/hwpmc/hwpmc_octeon.c b/sys/dev/hwpmc/hwpmc_octeon.c
index 1b90833bbb35..1b3bd8fde41b 100644
--- a/sys/dev/hwpmc/hwpmc_octeon.c
+++ b/sys/dev/hwpmc/hwpmc_octeon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_power8.c b/sys/dev/hwpmc/hwpmc_power8.c
index 7cc2ac8295f6..7ddfcc216e16 100644
--- a/sys/dev/hwpmc/hwpmc_power8.c
+++ b/sys/dev/hwpmc/hwpmc_power8.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Justin Hibbits
* Copyright (c) 2020 Leandro Lupori
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
index 364e66f77870..cc96b43499e5 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.c
+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011,2013 Justin Hibbits
* Copyright (c) 2005, Joseph Koshy
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.h b/sys/dev/hwpmc/hwpmc_powerpc.h
index efd7aca1b9ef..f6b3c15bc345 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.h
+++ b/sys/dev/hwpmc/hwpmc_powerpc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Justin Hibbits
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_ppc970.c b/sys/dev/hwpmc/hwpmc_ppc970.c
index 3e92c4dc6aa2..11c55bc3209c 100644
--- a/sys/dev/hwpmc/hwpmc_ppc970.c
+++ b/sys/dev/hwpmc/hwpmc_ppc970.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Justin Hibbits
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_soft.c b/sys/dev/hwpmc/hwpmc_soft.c
index 30d8e5013972..be012e260c18 100644
--- a/sys/dev/hwpmc/hwpmc_soft.c
+++ b/sys/dev/hwpmc/hwpmc_soft.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Fabien Thomas
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_soft.h b/sys/dev/hwpmc/hwpmc_soft.h
index 68df3ee846ca..8fe7c15ce9b6 100644
--- a/sys/dev/hwpmc/hwpmc_soft.h
+++ b/sys/dev/hwpmc/hwpmc_soft.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Fabien Thomas
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_tsc.c b/sys/dev/hwpmc/hwpmc_tsc.c
index 82ad5069abd4..547b00ec2fcd 100644
--- a/sys/dev/hwpmc/hwpmc_tsc.c
+++ b/sys/dev/hwpmc/hwpmc_tsc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_tsc.h b/sys/dev/hwpmc/hwpmc_tsc.h
index 57156d053d9d..0cb98be6adda 100644
--- a/sys/dev/hwpmc/hwpmc_tsc.h
+++ b/sys/dev/hwpmc/hwpmc_tsc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c
index 4c1872ed9c4d..b0c868fb41bd 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.c
+++ b/sys/dev/hwpmc/hwpmc_uncore.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Fabien Thomas
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_uncore.h b/sys/dev/hwpmc/hwpmc_uncore.h
index 5e8610f77ddf..af4dbd057f01 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.h
+++ b/sys/dev/hwpmc/hwpmc_uncore.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Fabien Thomas
* All rights reserved.
diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
index 9bbe66b2dfaf..b2d9d4e32f26 100644
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005,2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index 5e77443c23c9..a98d816bd1cd 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Joseph Koshy
* All rights reserved.
diff --git a/sys/dev/hyperv/hvsock/hv_sock.c b/sys/dev/hyperv/hvsock/hv_sock.c
index 5ca00d9f242f..ca606d693d6d 100644
--- a/sys/dev/hyperv/hvsock/hv_sock.c
+++ b/sys/dev/hyperv/hvsock/hv_sock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Microsoft Corp.
* All rights reserved.
diff --git a/sys/dev/hyperv/hvsock/hv_sock.h b/sys/dev/hyperv/hvsock/hv_sock.h
index 877425968345..f06d6f2b2eb0 100644
--- a/sys/dev/hyperv/hvsock/hv_sock.h
+++ b/sys/dev/hyperv/hvsock/hv_sock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Microsoft Corp.
* All rights reserved.
diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 8b985b2f31a7..fb92e07206c0 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
* Copyright (c) 2012 NetApp Inc.
diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
index c5be9c443456..55e82e39aeed 100644
--- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
* Copyright (c) 2012 NetApp Inc.
diff --git a/sys/dev/hyperv/storvsc/hv_vstorage.h b/sys/dev/hyperv/storvsc/hv_vstorage.h
index f1d4c1dfd2e2..0446aafeb8bc 100644
--- a/sys/dev/hyperv/storvsc/hv_vstorage.h
+++ b/sys/dev/hyperv/storvsc/hv_vstorage.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2012,2017 Microsoft Corp.
* Copyright (c) 2012 NetApp Inc.
diff --git a/sys/dev/hyperv/utilities/hv_kvp.h b/sys/dev/hyperv/utilities/hv_kvp.h
index 91e1ea404d4a..93026b32d7a7 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.h
+++ b/sys/dev/hyperv/utilities/hv_kvp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014,2016 Microsoft Corp.
* All rights reserved.
diff --git a/sys/dev/ic/cd180.h b/sys/dev/ic/cd180.h
index 68f0f47f6adb..656b096758b5 100644
--- a/sys/dev/ic/cd180.h
+++ b/sys/dev/ic/cd180.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
diff --git a/sys/dev/ic/i8259.h b/sys/dev/ic/i8259.h
index facf663d8e1f..09b3ceb92f56 100644
--- a/sys/dev/ic/i8259.h
+++ b/sys/dev/ic/i8259.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm
* All rights reserved.
diff --git a/sys/dev/ic/quicc.h b/sys/dev/ic/quicc.h
index af05e03c2813..0458836c5d2a 100644
--- a/sys/dev/ic/quicc.h
+++ b/sys/dev/ic/quicc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Juniper Networks
* All rights reserved.
diff --git a/sys/dev/ic/z8530.h b/sys/dev/ic/z8530.h
index 61dce69a718f..052d2cd0a0b2 100644
--- a/sys/dev/ic/z8530.h
+++ b/sys/dev/ic/z8530.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 587f99f9e7ee..8698e293c2a8 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Texas A&M University
* All rights reserved.
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index f78485249871..6f8505f96a4e 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Texas A&M University
* All rights reserved.
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index c09e856a75af..e0342b509dbb 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 227a8e1170eb..85781db3cb68 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 083d52ded3f1..52de2e965392 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index bfaee97681f8..52665c433d41 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 8ff7181bf185..2dfaf142930f 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Jonathan Lemon
* All rights reserved.
diff --git a/sys/dev/iicbus/acpi_iicbus.c b/sys/dev/iicbus/acpi_iicbus.c
index 33c0cdba4058..a342a1f29300 100644
--- a/sys/dev/iicbus/acpi_iicbus.c
+++ b/sys/dev/iicbus/acpi_iicbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019-2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/ad7417.c
index 43170ce2e81f..6c94c6d24d4c 100644
--- a/sys/dev/iicbus/ad7417.c
+++ b/sys/dev/iicbus/ad7417.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Andreas Tobler
*
diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/ad7418.c
index b2743d0f0b57..dcd7c8bfe2ee 100644
--- a/sys/dev/iicbus/ad7418.c
+++ b/sys/dev/iicbus/ad7418.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Sam Leffler. All rights reserved.
*
diff --git a/sys/dev/iicbus/adt746x.c b/sys/dev/iicbus/adt746x.c
index 435075e78e4a..16515c7d1c04 100644
--- a/sys/dev/iicbus/adt746x.c
+++ b/sys/dev/iicbus/adt746x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Andreas Tobler
* Copyright (c) 2014 Justin Hibbits
diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/ds1631.c
index f552005a739b..c98b5dd80c69 100644
--- a/sys/dev/iicbus/ds1631.c
+++ b/sys/dev/iicbus/ds1631.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Andreas Tobler
*
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/ds1672.c
index 6b204789bce9..be0a84607779 100644
--- a/sys/dev/iicbus/ds1672.c
+++ b/sys/dev/iicbus/ds1672.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Sam Leffler. All rights reserved.
*
diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/ds1775.c
index 223ce4410b72..c64a58bdf201 100644
--- a/sys/dev/iicbus/ds1775.c
+++ b/sys/dev/iicbus/ds1775.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Andreas Tobler
*
diff --git a/sys/dev/iicbus/gpio/tca6416.c b/sys/dev/iicbus/gpio/tca6416.c
index 436a21ec10b7..ea9310d049f0 100644
--- a/sys/dev/iicbus/gpio/tca6416.c
+++ b/sys/dev/iicbus/gpio/tca6416.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c
index a658d73cb875..b16adbd10b9a 100644
--- a/sys/dev/iicbus/icee.c
+++ b/sys/dev/iicbus/icee.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 603265a52b13..c7c1d0a7ab2b 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index b4a60c29ca9a..c30763ec9ca5 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 5ebf56a9f7f3..c567d68782d3 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/dev/iicbus/iic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index caa544ef403c..6c936a57c064 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 9d6f49de0582..6bb0526fd947 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index d3c3f77d5455..e02bae222a85 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/iicoc.c
index e243e7128be7..a01a7aa7a33f 100644
--- a/sys/dev/iicbus/iicoc.c
+++ b/sys/dev/iicbus/iicoc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/iicoc.h
index c9b91ef1a895..08e79d6e2a45 100644
--- a/sys/dev/iicbus/iicoc.h
+++ b/sys/dev/iicbus/iicoc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/iicoc_fdt.c
index 699a1738f53b..ddca3bba911a 100644
--- a/sys/dev/iicbus/iicoc_fdt.c
+++ b/sys/dev/iicbus/iicoc_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Axiado Corporation.
* All rights reserved.
diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/iicoc_pci.c
index 7a1066439404..ba8a38e9f5cc 100644
--- a/sys/dev/iicbus/iicoc_pci.c
+++ b/sys/dev/iicbus/iicoc_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All rights reserved.
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 6f24119660ab..8debde0c967e 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index b6a9c3b54fcf..0e01e0659dcb 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 8e79452cf2a8..272093f7a108 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/max6690.c
index c6c6666c3d41..9c381399cd76 100644
--- a/sys/dev/iicbus/max6690.c
+++ b/sys/dev/iicbus/max6690.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Andreas Tobler
*
diff --git a/sys/dev/iicbus/pmic/act8846.c b/sys/dev/iicbus/pmic/act8846.c
index 643f94aa7a7d..01d1a68a45b9 100644
--- a/sys/dev/iicbus/pmic/act8846.c
+++ b/sys/dev/iicbus/pmic/act8846.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/dev/iicbus/pmic/act8846.h b/sys/dev/iicbus/pmic/act8846.h
index b5be81f52769..7a34c176565c 100644
--- a/sys/dev/iicbus/pmic/act8846.h
+++ b/sys/dev/iicbus/pmic/act8846.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/iicbus/pmic/act8846_reg.h b/sys/dev/iicbus/pmic/act8846_reg.h
index 537967044a56..904d25930102 100644
--- a/sys/dev/iicbus/pmic/act8846_reg.h
+++ b/sys/dev/iicbus/pmic/act8846_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/dev/iicbus/pmic/act8846_regulator.c b/sys/dev/iicbus/pmic/act8846_regulator.c
index 906f89530090..f515f49e8395 100644
--- a/sys/dev/iicbus/pmic/act8846_regulator.c
+++ b/sys/dev/iicbus/pmic/act8846_regulator.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/dev/iicbus/pmic/fan53555.c b/sys/dev/iicbus/pmic/fan53555.c
index 3856343c5352..dbc1d5f99211 100644
--- a/sys/dev/iicbus/pmic/fan53555.c
+++ b/sys/dev/iicbus/pmic/fan53555.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca>
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
diff --git a/sys/dev/iicbus/rtc/rx8803.c b/sys/dev/iicbus/rtc/rx8803.c
index 2b8dc3623dd9..8c603f79c703 100644
--- a/sys/dev/iicbus/rtc/rx8803.c
+++ b/sys/dev/iicbus/rtc/rx8803.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c
index 3b026f5b8d87..405b537ffb5f 100644
--- a/sys/dev/iicbus/s35390a.c
+++ b/sys/dev/iicbus/s35390a.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2012 Yusuke Tanaka
* All rights reserved.
diff --git a/sys/dev/iicbus/syr827.c b/sys/dev/iicbus/syr827.c
index ba3cf82457d7..134447cace20 100644
--- a/sys/dev/iicbus/syr827.c
+++ b/sys/dev/iicbus/syr827.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Jared McNeill <jmcneill@invisible.ca>
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
diff --git a/sys/dev/imcsmb/imcsmb.c b/sys/dev/imcsmb/imcsmb.c
index 0c18fb9f68cb..01e716886e31 100644
--- a/sys/dev/imcsmb/imcsmb.c
+++ b/sys/dev/imcsmb/imcsmb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Authors: Joe Kloss; Ravi Pokala (rpokala@freebsd.org)
*
diff --git a/sys/dev/imcsmb/imcsmb_pci.c b/sys/dev/imcsmb/imcsmb_pci.c
index 0843e61f88d1..537542b7cfa4 100644
--- a/sys/dev/imcsmb/imcsmb_pci.c
+++ b/sys/dev/imcsmb/imcsmb_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Authors: Joe Kloss; Ravi Pokala (rpokala@freebsd.org)
*
diff --git a/sys/dev/imcsmb/imcsmb_reg.h b/sys/dev/imcsmb/imcsmb_reg.h
index 4d4f56986664..2efada29e00b 100644
--- a/sys/dev/imcsmb/imcsmb_reg.h
+++ b/sys/dev/imcsmb/imcsmb_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Authors: Joe Kloss; Ravi Pokala (rpokala@freebsd.org)
*
diff --git a/sys/dev/imcsmb/imcsmb_var.h b/sys/dev/imcsmb/imcsmb_var.h
index 0bf81c417042..088745fd61fd 100644
--- a/sys/dev/imcsmb/imcsmb_var.h
+++ b/sys/dev/imcsmb/imcsmb_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Authors: Joe Kloss; Ravi Pokala (rpokala@freebsd.org)
*
diff --git a/sys/dev/io/iodev.c b/sys/dev/io/iodev.c
index e9859792b200..71c85bdf064e 100644
--- a/sys/dev/io/iodev.c
+++ b/sys/dev/io/iodev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/dev/io/iodev.h b/sys/dev/io/iodev.h
index 5558a9bb5504..08ad62011e87 100644
--- a/sys/dev/io/iodev.h
+++ b/sys/dev/io/iodev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
index 99960daa3219..dfa4b6202ad7 100644
--- a/sys/dev/iommu/busdma_iommu.c
+++ b/sys/dev/iommu/busdma_iommu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/iommu/busdma_iommu.h b/sys/dev/iommu/busdma_iommu.h
index 98e7b94d4ed9..776813e19315 100644
--- a/sys/dev/iommu/busdma_iommu.h
+++ b/sys/dev/iommu/busdma_iommu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h
index cee59a0b55c0..6a8d1e9add4d 100644
--- a/sys/dev/iommu/iommu.h
+++ b/sys/dev/iommu/iommu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c
index fbef902e2f69..2185652b3787 100644
--- a/sys/dev/iommu/iommu_gas.c
+++ b/sys/dev/iommu/iommu_gas.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/iommu/iommu_gas.h b/sys/dev/iommu/iommu_gas.h
index 75a57ec0478f..0d1f8296d73c 100644
--- a/sys/dev/iommu/iommu_gas.h
+++ b/sys/dev/iommu/iommu_gas.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/iommu/iommu_types.h b/sys/dev/iommu/iommu_types.h
index 78f3000d0f65..6bf158b9b38c 100644
--- a/sys/dev/iommu/iommu_types.h
+++ b/sys/dev/iommu/iommu_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
index ec9ede66e556..64300695cc7c 100644
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_acpi.c b/sys/dev/ipmi/ipmi_acpi.c
index 9d92608e8f1d..7e25c66ce17f 100644
--- a/sys/dev/ipmi/ipmi_acpi.c
+++ b/sys/dev/ipmi/ipmi_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_isa.c b/sys/dev/ipmi/ipmi_isa.c
index 9abe697c23fc..2c12e568c1de 100644
--- a/sys/dev/ipmi/ipmi_isa.c
+++ b/sys/dev/ipmi/ipmi_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_kcs.c b/sys/dev/ipmi/ipmi_kcs.c
index 79f2ef720ca8..e70fed7b326e 100644
--- a/sys/dev/ipmi/ipmi_kcs.c
+++ b/sys/dev/ipmi/ipmi_kcs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_linux.c b/sys/dev/ipmi/ipmi_linux.c
index 4b33c5b014d8..78436d95e3bf 100644
--- a/sys/dev/ipmi/ipmi_linux.c
+++ b/sys/dev/ipmi/ipmi_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_pci.c b/sys/dev/ipmi/ipmi_pci.c
index 76b9832c8db1..3fe3d187212a 100644
--- a/sys/dev/ipmi/ipmi_pci.c
+++ b/sys/dev/ipmi/ipmi_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c
index 7917464d7d32..5e771f20dae5 100644
--- a/sys/dev/ipmi/ipmi_smbios.c
+++ b/sys/dev/ipmi/ipmi_smbios.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_smbus.c b/sys/dev/ipmi/ipmi_smbus.c
index 652e0ea6e665..2e5575f0cc69 100644
--- a/sys/dev/ipmi/ipmi_smbus.c
+++ b/sys/dev/ipmi/ipmi_smbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_smic.c b/sys/dev/ipmi/ipmi_smic.c
index 4a515a379725..18af247d104c 100644
--- a/sys/dev/ipmi/ipmi_smic.c
+++ b/sys/dev/ipmi/ipmi_smic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmi_ssif.c b/sys/dev/ipmi/ipmi_ssif.c
index 197c317dcc09..e7e6c8d6e732 100644
--- a/sys/dev/ipmi/ipmi_ssif.c
+++ b/sys/dev/ipmi/ipmi_ssif.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ipmi/ipmivars.h b/sys/dev/ipmi/ipmivars.h
index 73b1073e5e16..a1371d2f8bda 100644
--- a/sys/dev/ipmi/ipmivars.h
+++ b/sys/dev/ipmi/ipmivars.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c
index 63ca8a053555..50918d2073b7 100644
--- a/sys/dev/ips/ips.c
+++ b/sys/dev/ips/ips.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index c57d5a459f5f..52ac33ba648f 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips_commands.c b/sys/dev/ips/ips_commands.c
index ef367bd83b70..ee82d02b4b0f 100644
--- a/sys/dev/ips/ips_commands.c
+++ b/sys/dev/ips/ips_commands.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 493e28d21e92..042b86123386 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index 1d532ed31193..123580e0ac30 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips_ioctl.c b/sys/dev/ips/ips_ioctl.c
index e495c639200b..8aec933a165f 100644
--- a/sys/dev/ips/ips_ioctl.c
+++ b/sys/dev/ips/ips_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Written by: David Jeffery
* Copyright (c) 2002 Adaptec Inc.
diff --git a/sys/dev/ips/ips_ioctl.h b/sys/dev/ips/ips_ioctl.h
index 34972eaa8ada..fd9924de89e7 100644
--- a/sys/dev/ips/ips_ioctl.h
+++ b/sys/dev/ips/ips_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index 588e14d5e6b8..fd59a1358f13 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ips/ipsreg.h b/sys/dev/ips/ipsreg.h
index 762ff315c6e3..4b88b193fc96 100644
--- a/sys/dev/ips/ipsreg.h
+++ b/sys/dev/ips/ipsreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index 74898589631e..81e2b1ee706f 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/sys/dev/ipw/if_ipwreg.h b/sys/dev/ipw/if_ipwreg.h
index a78910b8272c..5403b2e726b9 100644
--- a/sys/dev/ipw/if_ipwreg.h
+++ b/sys/dev/ipw/if_ipwreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index 448321114162..f620b47ed974 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/sys/dev/isci/types.h b/sys/dev/isci/types.h
index 51f3aff93408..a3c16fa071ca 100644
--- a/sys/dev/isci/types.h
+++ b/sys/dev/isci/types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* BSD LICENSE
*
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c
index 1a86474a5033..4487e7400f52 100644
--- a/sys/dev/iscsi/icl.c
+++ b/sys/dev/iscsi/icl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/icl.h b/sys/dev/iscsi/icl.h
index 59b1e2aacc96..e9a630f7b622 100644
--- a/sys/dev/iscsi/icl.h
+++ b/sys/dev/iscsi/icl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/icl_conn_if.m b/sys/dev/iscsi/icl_conn_if.m
index 1b424b0b0f31..13e0344a2fb0 100644
--- a/sys/dev/iscsi/icl_conn_if.m
+++ b/sys/dev/iscsi/icl_conn_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2014 The FreeBSD Foundation
#
diff --git a/sys/dev/iscsi/icl_soft.c b/sys/dev/iscsi/icl_soft.c
index 700925b4ddcc..eb5360fc7da9 100644
--- a/sys/dev/iscsi/icl_soft.c
+++ b/sys/dev/iscsi/icl_soft.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/icl_wrappers.h b/sys/dev/iscsi/icl_wrappers.h
index c2f215c10607..8cf227850947 100644
--- a/sys/dev/iscsi/icl_wrappers.h
+++ b/sys/dev/iscsi/icl_wrappers.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index 1075c1359575..57aa3c014789 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/iscsi.h b/sys/dev/iscsi/iscsi.h
index 871fc6fc90e9..0d30c7d9a44e 100644
--- a/sys/dev/iscsi/iscsi.h
+++ b/sys/dev/iscsi/iscsi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/iscsi_ioctl.h b/sys/dev/iscsi/iscsi_ioctl.h
index fe5a39e29d20..92295a8511ac 100644
--- a/sys/dev/iscsi/iscsi_ioctl.h
+++ b/sys/dev/iscsi/iscsi_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi/iscsi_proto.h b/sys/dev/iscsi/iscsi_proto.h
index eaa3849aac7e..ffe959aa1fb5 100644
--- a/sys/dev/iscsi/iscsi_proto.h
+++ b/sys/dev/iscsi/iscsi_proto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/iscsi_initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c
index d14856de8e30..082841c5577c 100644
--- a/sys/dev/iscsi_initiator/isc_cam.c
+++ b/sys/dev/iscsi_initiator/isc_cam.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/isc_sm.c b/sys/dev/iscsi_initiator/isc_sm.c
index 51d7036750e7..a342ca75cd7e 100644
--- a/sys/dev/iscsi_initiator/isc_sm.c
+++ b/sys/dev/iscsi_initiator/isc_sm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/isc_soc.c b/sys/dev/iscsi_initiator/isc_soc.c
index f4d62e2944a8..dfaa05af7a39 100644
--- a/sys/dev/iscsi_initiator/isc_soc.c
+++ b/sys/dev/iscsi_initiator/isc_soc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/isc_subr.c b/sys/dev/iscsi_initiator/isc_subr.c
index c6f9a4efdabb..055691cb0d40 100644
--- a/sys/dev/iscsi_initiator/isc_subr.c
+++ b/sys/dev/iscsi_initiator/isc_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c
index ce190c5c892a..def498d91920 100644
--- a/sys/dev/iscsi_initiator/iscsi.c
+++ b/sys/dev/iscsi_initiator/iscsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/iscsi.h b/sys/dev/iscsi_initiator/iscsi.h
index 6791fbfd87c0..6720100f24ea 100644
--- a/sys/dev/iscsi_initiator/iscsi.h
+++ b/sys/dev/iscsi_initiator/iscsi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/iscsi_subr.c b/sys/dev/iscsi_initiator/iscsi_subr.c
index e3fa9b79f5a2..6fb885f019d4 100644
--- a/sys/dev/iscsi_initiator/iscsi_subr.c
+++ b/sys/dev/iscsi_initiator/iscsi_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/iscsi_initiator/iscsivar.h b/sys/dev/iscsi_initiator/iscsivar.h
index 26b19dee1db3..8b78f5ecb793 100644
--- a/sys/dev/iscsi_initiator/iscsivar.h
+++ b/sys/dev/iscsi_initiator/iscsivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Daniel Braniss <danny@cs.huji.ac.il>
* All rights reserved.
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index cc2f5ae23d2f..a2c6e12d37cc 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index d5e70e96fc44..46fe858fc93d 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index a35a1ff4a562..1ee0eb69e1c2 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
*
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index f54ea086dde5..31745d5565e0 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2006 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c
index 5bf3906200fa..187f9ae09392 100644
--- a/sys/dev/isp/isp_library.c
+++ b/sys/dev/isp/isp_library.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/isp_library.h b/sys/dev/isp/isp_library.h
index 3c4d31e0bca5..e009ae4524df 100644
--- a/sys/dev/isp/isp_library.h
+++ b/sys/dev/isp/isp_library.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 01028ae140be..a84b19931d50 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2008 by Matthew Jacob
diff --git a/sys/dev/isp/isp_stds.h b/sys/dev/isp/isp_stds.h
index 2dfea07cf55d..55f33f672436 100644
--- a/sys/dev/isp/isp_stds.h
+++ b/sys/dev/isp/isp_stds.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index 8f9703761a05..6efe645127d7 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index 60bc0d7f59b5..1650c4f4dd54 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2009 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 88bfa8f68a84..3d0cbcffaa6b 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 98b9a6c0bf0d..4f7bc9cb37ce 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index eae81f6ac9ed..66faf939a1dd 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2020 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 1997-2009 by Matthew Jacob
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c
index 6c8683ee79f3..99adabb6b774 100644
--- a/sys/dev/ispfw/ispfw.c
+++ b/sys/dev/ispfw/ispfw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ISP Firmware Modules for FreeBSD
*
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index c270550d1bba..c48403307d44 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/sys/dev/iwi/if_iwireg.h b/sys/dev/iwi/if_iwireg.h
index 32cec30e66fe..09c10c0c273d 100644
--- a/sys/dev/iwi/if_iwireg.h
+++ b/sys/dev/iwi/if_iwireg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/sys/dev/iwi/if_iwivar.h b/sys/dev/iwi/if_iwivar.h
index 6951098f9e43..8ba31242e966 100644
--- a/sys/dev/iwi/if_iwivar.h
+++ b/sys/dev/iwi/if_iwivar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
diff --git a/sys/dev/jedec_dimm/jedec_dimm.c b/sys/dev/jedec_dimm/jedec_dimm.c
index 240fbe230d9f..ec1b6c9636df 100644
--- a/sys/dev/jedec_dimm/jedec_dimm.c
+++ b/sys/dev/jedec_dimm/jedec_dimm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Authors: Ravi Pokala (rpokala@freebsd.org), Andriy Gapon (avg@FreeBSD.org)
*
diff --git a/sys/dev/jedec_dimm/jedec_dimm.h b/sys/dev/jedec_dimm/jedec_dimm.h
index 00a9b3d521b6..9ccd6b913556 100644
--- a/sys/dev/jedec_dimm/jedec_dimm.h
+++ b/sys/dev/jedec_dimm/jedec_dimm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Authors: Ravi Pokala (rpokala@freebsd.org)
*
diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c
index 754f9aff61c2..68a2d0b553e4 100644
--- a/sys/dev/jme/if_jme.c
+++ b/sys/dev/jme/if_jme.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/jme/if_jmereg.h b/sys/dev/jme/if_jmereg.h
index 3b9e0b4ae1cf..13ba5938efc1 100644
--- a/sys/dev/jme/if_jmereg.h
+++ b/sys/dev/jme/if_jmereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/jme/if_jmevar.h b/sys/dev/jme/if_jmevar.h
index 2e34364a962e..af1099d11a12 100644
--- a/sys/dev/jme/if_jmevar.h
+++ b/sys/dev/jme/if_jmevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 41d6fd5666d8..e909b93a8764 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 15b7e5183f35..e556a65490f7 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index c1c6defc2d91..cecc3eefacf9 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992-1998 Sen Schmidt
* All rights reserved.
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index 1545022bec2a..a930c2ee8a26 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/dev/ksyms/ksyms.c b/sys/dev/ksyms/ksyms.c
index 2fb3d9bd2f79..0c89b3115c77 100644
--- a/sys/dev/ksyms/ksyms.c
+++ b/sys/dev/ksyms/ksyms.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009, Stacey Son <sson@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/kvm_clock/kvm_clock.c b/sys/dev/kvm_clock/kvm_clock.c
index 982a345a74c7..2c1ca1840d09 100644
--- a/sys/dev/kvm_clock/kvm_clock.c
+++ b/sys/dev/kvm_clock/kvm_clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Bryan Venteicher <bryanv@FreeBSD.org>
* Copyright (c) 2021 Mathieu Chouquet-Stringer
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index 2c397e1fe6d4..fcd55d68059c 100644
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
* Copyright (c) 2007 Marvell Semiconductor, Inc.
diff --git a/sys/dev/malo/if_malo.h b/sys/dev/malo/if_malo.h
index e6246faf26cd..91b6d707a323 100644
--- a/sys/dev/malo/if_malo.h
+++ b/sys/dev/malo/if_malo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
diff --git a/sys/dev/malo/if_malo_pci.c b/sys/dev/malo/if_malo_pci.c
index 0d1b7f9995a0..a8ed08bb88e9 100644
--- a/sys/dev/malo/if_malo_pci.c
+++ b/sys/dev/malo/if_malo_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
diff --git a/sys/dev/malo/if_malohal.c b/sys/dev/malo/if_malohal.c
index ed74a7324b2c..27f2562df839 100644
--- a/sys/dev/malo/if_malohal.c
+++ b/sys/dev/malo/if_malohal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
diff --git a/sys/dev/malo/if_malohal.h b/sys/dev/malo/if_malohal.h
index 6a68a41afea9..f3541c28f6b7 100644
--- a/sys/dev/malo/if_malohal.h
+++ b/sys/dev/malo/if_malohal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
diff --git a/sys/dev/malo/if_maloioctl.h b/sys/dev/malo/if_maloioctl.h
index 6707b4c35aaf..d95ead4eeeb6 100644
--- a/sys/dev/malo/if_maloioctl.h
+++ b/sys/dev/malo/if_maloioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Marvell Semiconductor, Inc.
* Copyright (c) 2007 Sam Leffler, Errno Consulting
diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c
index 7d33066f5678..e81cbcb29131 100644
--- a/sys/dev/mem/memdev.c
+++ b/sys/dev/mem/memdev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c
index ff28deb3abd1..0e25782ee8b4 100644
--- a/sys/dev/mem/memutil.c
+++ b/sys/dev/mem/memutil.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 1b26c194400f..3c88e505bb7b 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c
index 32fe8b2fdc25..987145a28cff 100644
--- a/sys/dev/mfi/mfi_cam.c
+++ b/sys/dev/mfi/mfi_cam.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2007 Scott Long
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_debug.c b/sys/dev/mfi/mfi_debug.c
index 919a728759ec..9ccfaee2dc5b 100644
--- a/sys/dev/mfi/mfi_debug.c
+++ b/sys/dev/mfi/mfi_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c
index 002fed7d2853..6483aad4dc48 100644
--- a/sys/dev/mfi/mfi_disk.c
+++ b/sys/dev/mfi/mfi_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_ioctl.h b/sys/dev/mfi/mfi_ioctl.h
index ff0bfa30b702..b4e65971e7e9 100644
--- a/sys/dev/mfi/mfi_ioctl.h
+++ b/sys/dev/mfi/mfi_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_linux.c b/sys/dev/mfi/mfi_linux.c
index 892b4f7a9fba..ce6b3f49ae8b 100644
--- a/sys/dev/mfi/mfi_linux.c
+++ b/sys/dev/mfi/mfi_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c
index f473a30f3f7f..6c791997341b 100644
--- a/sys/dev/mfi/mfi_pci.c
+++ b/sys/dev/mfi/mfi_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfi_syspd.c b/sys/dev/mfi/mfi_syspd.c
index f919a39b3587..76e5e37b8716 100644
--- a/sys/dev/mfi/mfi_syspd.c
+++ b/sys/dev/mfi/mfi_syspd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/dev/mfi/mfi_tbolt.c b/sys/dev/mfi/mfi_tbolt.c
index f9eaf16912c3..8d12d634997a 100644
--- a/sys/dev/mfi/mfi_tbolt.c
+++ b/sys/dev/mfi/mfi_tbolt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h
index 5b395493b144..dea3fce664b2 100644
--- a/sys/dev/mfi/mfireg.h
+++ b/sys/dev/mfi/mfireg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h
index ec242a7f8dd2..72658d8a8aad 100644
--- a/sys/dev/mfi/mfivar.h
+++ b/sys/dev/mfi/mfivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
diff --git a/sys/dev/mii/acphyreg.h b/sys/dev/mii/acphyreg.h
index 74cd6a79e840..734aa68fe721 100644
--- a/sys/dev/mii/acphyreg.h
+++ b/sys/dev/mii/acphyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Semen Ustimenko (semenu@FreeBSD.org)
* All rights reserved.
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index fa729b6a75ca..a3b4b8a16e79 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mii/atphyreg.h b/sys/dev/mii/atphyreg.h
index 01e70ea22156..1533a08e44ca 100644
--- a/sys/dev/mii/atphyreg.h
+++ b/sys/dev/mii/atphyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon
* All rights reserved.
diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c
index 2e32486f1eea..6cb05107bf48 100644
--- a/sys/dev/mii/axphy.c
+++ b/sys/dev/mii/axphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c
index ad0c4805a552..f746ab785e23 100644
--- a/sys/dev/mii/ip1000phy.c
+++ b/sys/dev/mii/ip1000phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mii/ip1000phyreg.h b/sys/dev/mii/ip1000phyreg.h
index 771e025e3040..39b544a1c2b5 100644
--- a/sys/dev/mii/ip1000phyreg.h
+++ b/sys/dev/mii/ip1000phyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, Pyun YongHyeon
* All rights reserved.
diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index ff6842562e0c..88539a651dba 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mii/jmphyreg.h b/sys/dev/mii/jmphyreg.h
index b7f42b411ccb..917d161227f6 100644
--- a/sys/dev/mii/jmphyreg.h
+++ b/sys/dev/mii/jmphyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Pyun YongHyeon
* All rights reserved.
diff --git a/sys/dev/mii/rdcphy.c b/sys/dev/mii/rdcphy.c
index d7fa8ced4fdb..f0dbfaaae05e 100644
--- a/sys/dev/mii/rdcphy.c
+++ b/sys/dev/mii/rdcphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mii/rdcphyreg.h b/sys/dev/mii/rdcphyreg.h
index 1fa77308222b..a74086021f60 100644
--- a/sys/dev/mii/rdcphyreg.h
+++ b/sys/dev/mii/rdcphyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mii/smcphy.c b/sys/dev/mii/smcphy.c
index 57b5eef0d968..e81a61c661c2 100644
--- a/sys/dev/mii/smcphy.c
+++ b/sys/dev/mii/smcphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
diff --git a/sys/dev/mii/smscphy.c b/sys/dev/mii/smscphy.c
index 25464b781441..a5dc12a8283d 100644
--- a/sys/dev/mii/smscphy.c
+++ b/sys/dev/mii/smscphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 7812a518f4bb..40562e13274d 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 798232016c34..97481209bdee 100644
--- a/sys/dev/mii/tdkphyreg.h
+++ b/sys/dev/mii/tdkphyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index 2f961d23e304..2f4deec94fb0 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index bc487d1330a0..c720524ce3e5 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Jonathan Lemon
* Copyright (c) 1999 Michael Smith
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index 8c9a75bba84f..c8b974b473d2 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mlx/mlxio.h b/sys/dev/mlx/mlxio.h
index 20107e72ae23..32742b1fb209 100644
--- a/sys/dev/mlx/mlxio.h
+++ b/sys/dev/mlx/mlxio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index a26dc21d9506..cc33e5b1cea7 100644
--- a/sys/dev/mlx/mlxreg.h
+++ b/sys/dev/mlx/mlxreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 4db328f72b4b..115a0148c7e6 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 194a14e257e4..121c238f9322 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 92e208a28a01..9d688bc57a23 100644
--- a/sys/dev/mly/mly_tables.h
+++ b/sys/dev/mly/mly_tables.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/mly/mlyio.h b/sys/dev/mly/mlyio.h
index 00a798ca670a..cc489f721979 100644
--- a/sys/dev/mly/mlyio.h
+++ b/sys/dev/mly/mlyio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Michael Smith
* All rights reserved.
diff --git a/sys/dev/mly/mlyreg.h b/sys/dev/mly/mlyreg.h
index b30a213b3619..232db65ba69e 100644
--- a/sys/dev/mly/mlyreg.h
+++ b/sys/dev/mly/mlyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/mly/mlyvar.h b/sys/dev/mly/mlyvar.h
index 336d47ac6096..4b9731e0605e 100644
--- a/sys/dev/mly/mlyvar.h
+++ b/sys/dev/mly/mlyvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/mmc/bridge.h b/sys/dev/mmc/bridge.h
index 5fbe11663708..e8655d8e7dd7 100644
--- a/sys/dev/mmc/bridge.h
+++ b/sys/dev/mmc/bridge.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c
index 24501080a971..4e4e3507a1f8 100644
--- a/sys/dev/mmc/mmc.c
+++ b/sys/dev/mmc/mmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/mmc/mmc_pwrseq.c b/sys/dev/mmc/mmc_pwrseq.c
index d4ccf814fe53..d1f644ba7709 100644
--- a/sys/dev/mmc/mmc_pwrseq.c
+++ b/sys/dev/mmc/mmc_pwrseq.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2021 Emmanuel Vadot <manu@freebsd.org>
*
diff --git a/sys/dev/mmc/mmc_pwrseq_if.m b/sys/dev/mmc/mmc_pwrseq_if.m
index e94b44052c20..60a8779d46da 100644
--- a/sys/dev/mmc/mmc_pwrseq_if.m
+++ b/sys/dev/mmc/mmc_pwrseq_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Emmanuel Vadot <manu@FreeBSD.org>
#
diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h
index 90095710dbb1..e36381e78e81 100644
--- a/sys/dev/mmc/mmcbrvar.h
+++ b/sys/dev/mmc/mmcbrvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h
index 97ddb6dbeeb6..07545d46f576 100644
--- a/sys/dev/mmc/mmcreg.h
+++ b/sys/dev/mmc/mmcreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
* Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index 3f3c65289d48..30eb29c4130d 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h
index 1714f73e3dda..e236144620af 100644
--- a/sys/dev/mmc/mmcvar.h
+++ b/sys/dev/mmc/mmcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/mps/mpi/mpi2.h b/sys/dev/mps/mpi/mpi2.h
index 229ee60fd45e..78ab6afd9cff 100644
--- a/sys/dev/mps/mpi/mpi2.h
+++ b/sys/dev/mps/mpi/mpi2.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_cnfg.h b/sys/dev/mps/mpi/mpi2_cnfg.h
index 630feb836895..5bb9b85cccad 100644
--- a/sys/dev/mps/mpi/mpi2_cnfg.h
+++ b/sys/dev/mps/mpi/mpi2_cnfg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_hbd.h b/sys/dev/mps/mpi/mpi2_hbd.h
index 2afcf05030b1..83336129b74b 100644
--- a/sys/dev/mps/mpi/mpi2_hbd.h
+++ b/sys/dev/mps/mpi/mpi2_hbd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_init.h b/sys/dev/mps/mpi/mpi2_init.h
index 6fb9087f91df..bbd845b5f19f 100644
--- a/sys/dev/mps/mpi/mpi2_init.h
+++ b/sys/dev/mps/mpi/mpi2_init.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_ioc.h b/sys/dev/mps/mpi/mpi2_ioc.h
index 28447cd1b3c5..7d80dc8dfcbb 100644
--- a/sys/dev/mps/mpi/mpi2_ioc.h
+++ b/sys/dev/mps/mpi/mpi2_ioc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_ra.h b/sys/dev/mps/mpi/mpi2_ra.h
index b5e67420621e..67dd7ed62c4b 100644
--- a/sys/dev/mps/mpi/mpi2_ra.h
+++ b/sys/dev/mps/mpi/mpi2_ra.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_raid.h b/sys/dev/mps/mpi/mpi2_raid.h
index 4d672cdddff7..31ec20e7fc65 100644
--- a/sys/dev/mps/mpi/mpi2_raid.h
+++ b/sys/dev/mps/mpi/mpi2_raid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_sas.h b/sys/dev/mps/mpi/mpi2_sas.h
index 193de240363d..a6918f14e832 100644
--- a/sys/dev/mps/mpi/mpi2_sas.h
+++ b/sys/dev/mps/mpi/mpi2_sas.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_targ.h b/sys/dev/mps/mpi/mpi2_targ.h
index eb60bdcc6a54..e007527b44cc 100644
--- a/sys/dev/mps/mpi/mpi2_targ.h
+++ b/sys/dev/mps/mpi/mpi2_targ.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_tool.h b/sys/dev/mps/mpi/mpi2_tool.h
index e6223f00bcd1..2dfb82f79e79 100644
--- a/sys/dev/mps/mpi/mpi2_tool.h
+++ b/sys/dev/mps/mpi/mpi2_tool.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mpi/mpi2_type.h b/sys/dev/mps/mpi/mpi2_type.h
index eb5f2d0db623..6985c4f12d9f 100644
--- a/sys/dev/mps/mpi/mpi2_type.h
+++ b/sys/dev/mps/mpi/mpi2_type.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c
index 7ff596d66085..722e39b759df 100644
--- a/sys/dev/mps/mps.c
+++ b/sys/dev/mps/mps.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Yahoo! Inc.
* Copyright (c) 2011-2015 LSI Corp.
diff --git a/sys/dev/mps/mps_config.c b/sys/dev/mps/mps_config.c
index d25347cb8f1a..fb142cb31b54 100644
--- a/sys/dev/mps/mps_config.c
+++ b/sys/dev/mps/mps_config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_mapping.c b/sys/dev/mps/mps_mapping.c
index 2b0c16a8deb8..325252e8ed31 100644
--- a/sys/dev/mps/mps_mapping.c
+++ b/sys/dev/mps/mps_mapping.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_mapping.h b/sys/dev/mps/mps_mapping.h
index 0cedee5b1f8c..671e496e58d4 100644
--- a/sys/dev/mps/mps_mapping.h
+++ b/sys/dev/mps/mps_mapping.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c
index 51ca92c0b203..77be6b7bab82 100644
--- a/sys/dev/mps/mps_pci.c
+++ b/sys/dev/mps/mps_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Yahoo! Inc.
* All rights reserved.
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
index d21cf1e2204e..f2c9853bfb23 100644
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Yahoo! Inc.
* Copyright (c) 2011-2015 LSI Corp.
diff --git a/sys/dev/mps/mps_sas.h b/sys/dev/mps/mps_sas.h
index 4d782ad8e7a3..04131cb73c9b 100644
--- a/sys/dev/mps/mps_sas.h
+++ b/sys/dev/mps/mps_sas.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c
index dc22af1e47d0..a3b6fbfe6e7d 100644
--- a/sys/dev/mps/mps_sas_lsi.c
+++ b/sys/dev/mps/mps_sas_lsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2015 LSI Corp.
* Copyright (c) 2013-2015 Avago Technologies
diff --git a/sys/dev/mps/mps_table.c b/sys/dev/mps/mps_table.c
index aec97327e6b6..b30cb902993c 100644
--- a/sys/dev/mps/mps_table.c
+++ b/sys/dev/mps/mps_table.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Yahoo! Inc.
* All rights reserved.
diff --git a/sys/dev/mps/mps_table.h b/sys/dev/mps/mps_table.h
index 2ad609dc9776..5fc49a76eed1 100644
--- a/sys/dev/mps/mps_table.h
+++ b/sys/dev/mps/mps_table.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Yahoo! Inc.
* All rights reserved.
diff --git a/sys/dev/mps/mpsvar.h b/sys/dev/mps/mpsvar.h
index 9cffd0f730d5..574cab6ab633 100644
--- a/sys/dev/mps/mpsvar.h
+++ b/sys/dev/mps/mpsvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Yahoo! Inc.
* Copyright (c) 2011-2015 LSI Corp.
diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index 1b9e5c042fdc..f2962210ba2c 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -2,7 +2,7 @@
* Generic routines for LSI Fusion adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000, 2001 by Greg Ansley
*
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 3231d30d0c61..0682609cad85 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -3,7 +3,7 @@
* Generic defines for LSI '909 FC adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000, 2001 by Greg Ansley
*
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index 64776d673674..250b4f1088d3 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -2,7 +2,7 @@
* FreeBSD/CAM specific routines for LSI '909 FC adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000, 2001 by Greg Ansley
*
diff --git a/sys/dev/mpt/mpt_cam.h b/sys/dev/mpt/mpt_cam.h
index 080a3c1fe9d9..de333b11678a 100644
--- a/sys/dev/mpt/mpt_cam.h
+++ b/sys/dev/mpt/mpt_cam.h
@@ -2,7 +2,7 @@
/*-
* LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000, 2001 by Greg Ansley, Adam Prewett
*
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index 5ed6493898b2..a266e68f7566 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -2,7 +2,7 @@
* Debug routines for LSI '909 FC adapters.
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000, 2001 by Greg Ansley
*
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index 94c568c4c205..0943dc53d328 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -2,7 +2,7 @@
* PCI specific probe and attach routines for LSI Fusion Adapters
* FreeBSD Version.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2000, 2001 by Greg Ansley
* Partially derived from Matt Jacob's ISP driver.
diff --git a/sys/dev/mpt/mpt_reg.h b/sys/dev/mpt/mpt_reg.h
index b66d67bcb1e1..65ffd6eef635 100644
--- a/sys/dev/mpt/mpt_reg.h
+++ b/sys/dev/mpt/mpt_reg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Generic defines for LSI '909 FC adapters.
* FreeBSD Version.
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index e446914c5113..c3b8f5205c75 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mvs/mvs.h b/sys/dev/mvs/mvs.h
index 4a5e58ffbe72..f95a017f0770 100644
--- a/sys/dev/mvs/mvs.h
+++ b/sys/dev/mvs/mvs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c
index 7e9c4111ca60..a404bc52abb5 100644
--- a/sys/dev/mvs/mvs_pci.c
+++ b/sys/dev/mvs/mvs_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 6243c2ce1951..677a77f35ac1 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index 07af5258c450..f86c52ca1f34 100644
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2008 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/if_mwl_pci.c b/sys/dev/mwl/if_mwl_pci.c
index bf17fe4750b1..9ee557a54648 100644
--- a/sys/dev/mwl/if_mwl_pci.c
+++ b/sys/dev/mwl/if_mwl_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/if_mwlioctl.h b/sys/dev/mwl/if_mwlioctl.h
index b2ab4cdbcf3a..87599112d329 100644
--- a/sys/dev/mwl/if_mwlioctl.h
+++ b/sys/dev/mwl/if_mwlioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/if_mwlvar.h b/sys/dev/mwl/if_mwlvar.h
index 5b5ce11d6247..f6c7ef555871 100644
--- a/sys/dev/mwl/if_mwlvar.h
+++ b/sys/dev/mwl/if_mwlvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/mwldiag.h b/sys/dev/mwl/mwldiag.h
index deb1704a6a1c..2cc33554d6e6 100644
--- a/sys/dev/mwl/mwldiag.h
+++ b/sys/dev/mwl/mwldiag.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/mwlhal.c b/sys/dev/mwl/mwlhal.c
index 4e341f49e85e..5c75c849b41a 100644
--- a/sys/dev/mwl/mwlhal.c
+++ b/sys/dev/mwl/mwlhal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/mwlhal.h b/sys/dev/mwl/mwlhal.h
index d745deafb9ae..c4fa0c11b8b0 100644
--- a/sys/dev/mwl/mwlhal.h
+++ b/sys/dev/mwl/mwlhal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mwl/mwlreg.h b/sys/dev/mwl/mwlreg.h
index 899b97c21cd0..6c7ffb9f8758 100644
--- a/sys/dev/mwl/mwlreg.h
+++ b/sys/dev/mwl/mwlreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Marvell Semiconductor, Inc.
diff --git a/sys/dev/mxge/eth_z8e.h b/sys/dev/mxge/eth_z8e.h
index cf8891b8e3a5..c553aaf59f44 100644
--- a/sys/dev/mxge/eth_z8e.h
+++ b/sys/dev/mxge/eth_z8e.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/ethp_z8e.h b/sys/dev/mxge/ethp_z8e.h
index 4f0defc89d64..355854520a0e 100644
--- a/sys/dev/mxge/ethp_z8e.h
+++ b/sys/dev/mxge/ethp_z8e.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index 8f849bbf87e3..af245762c9e8 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -1,5 +1,5 @@
/******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2013, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h
index c166011d434f..5a7f5caa05ef 100644
--- a/sys/dev/mxge/if_mxge_var.h
+++ b/sys/dev/mxge/if_mxge_var.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2013, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/mcp_gen_header.h b/sys/dev/mxge/mcp_gen_header.h
index 629ab4a38525..07c3f83bf2d2 100644
--- a/sys/dev/mxge/mcp_gen_header.h
+++ b/sys/dev/mxge/mcp_gen_header.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2007, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h
index 442af4bc7ef3..9f7ae28f2afd 100644
--- a/sys/dev/mxge/mxge_mcp.h
+++ b/sys/dev/mxge/mxge_mcp.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2009, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/rss_eth_z8e.h b/sys/dev/mxge/rss_eth_z8e.h
index 964293196267..c04e9f6dbbfb 100644
--- a/sys/dev/mxge/rss_eth_z8e.h
+++ b/sys/dev/mxge/rss_eth_z8e.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/mxge/rss_ethp_z8e.h b/sys/dev/mxge/rss_ethp_z8e.h
index 60d7d210f9fe..4c5d86270c9c 100644
--- a/sys/dev/mxge/rss_ethp_z8e.h
+++ b/sys/dev/mxge/rss_ethp_z8e.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+SPDX-License-Identifier: BSD-2-Clause
Copyright (c) 2006-2012, Myricom Inc.
All rights reserved.
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 1e519e700379..2b0a6bba594b 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Written by: yen_cw@myson.com.tw
* Copyright (c) 2002 Myson Technology Inc.
diff --git a/sys/dev/my/if_myreg.h b/sys/dev/my/if_myreg.h
index a3a723d05322..4a2a817a68bd 100644
--- a/sys/dev/my/if_myreg.h
+++ b/sys/dev/my/if_myreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Myson Technology Inc.
* All rights reserved.
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index 7c356ab4bd22..fe27f7c18be7 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011-2014 Luigi Rizzo. All rights reserved.
*
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index aedb8c048c81..e630744d67ff 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011-2014 Matteo Landi
* Copyright (C) 2011-2016 Luigi Rizzo
diff --git a/sys/dev/netmap/netmap_bdg.h b/sys/dev/netmap/netmap_bdg.h
index 42640128fcbd..29e6300ed37c 100644
--- a/sys/dev/netmap/netmap_bdg.h
+++ b/sys/dev/netmap/netmap_bdg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013-2018 Universita` di Pisa
* All rights reserved.
diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c
index 91c3e380117a..da631015662c 100644
--- a/sys/dev/netmap/netmap_freebsd.c
+++ b/sys/dev/netmap/netmap_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013-2014 Universita` di Pisa. All rights reserved.
*
diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c
index f726cf471177..3c4f5d54b4a8 100644
--- a/sys/dev/netmap/netmap_generic.c
+++ b/sys/dev/netmap/netmap_generic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013-2016 Vincenzo Maffione
* Copyright (C) 2013-2016 Luigi Rizzo
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index 237b2b39047a..8fb33d99fc80 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo
* Copyright (C) 2013-2016 Universita` di Pisa
diff --git a/sys/dev/netmap/netmap_legacy.c b/sys/dev/netmap/netmap_legacy.c
index 512e1e084910..b619b1d78b7e 100644
--- a/sys/dev/netmap/netmap_legacy.c
+++ b/sys/dev/netmap/netmap_legacy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Vincenzo Maffione
* All rights reserved.
diff --git a/sys/dev/netmap/netmap_mbq.c b/sys/dev/netmap/netmap_mbq.c
index 3ce73f0e065c..0c8ed17c7043 100644
--- a/sys/dev/netmap/netmap_mbq.c
+++ b/sys/dev/netmap/netmap_mbq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013-2014 Vincenzo Maffione
* All rights reserved.
diff --git a/sys/dev/netmap/netmap_mbq.h b/sys/dev/netmap/netmap_mbq.h
index 044cb54bbf09..2db14cc1038f 100644
--- a/sys/dev/netmap/netmap_mbq.h
+++ b/sys/dev/netmap/netmap_mbq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013-2014 Vincenzo Maffione
* All rights reserved.
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index a134194eb991..83eee69aa33b 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2014 Matteo Landi
* Copyright (C) 2012-2016 Luigi Rizzo
diff --git a/sys/dev/netmap/netmap_mem2.h b/sys/dev/netmap/netmap_mem2.h
index 0ee12fcb907c..7c17cc428eac 100644
--- a/sys/dev/netmap/netmap_mem2.h
+++ b/sys/dev/netmap/netmap_mem2.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2014 Matteo Landi
* Copyright (C) 2012-2016 Luigi Rizzo
diff --git a/sys/dev/netmap/netmap_offloadings.c b/sys/dev/netmap/netmap_offloadings.c
index a6ff8b00a402..745f5f401f31 100644
--- a/sys/dev/netmap/netmap_offloadings.c
+++ b/sys/dev/netmap/netmap_offloadings.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2014-2015 Vincenzo Maffione
* All rights reserved.
diff --git a/sys/dev/netmap/netmap_pipe.c b/sys/dev/netmap/netmap_pipe.c
index 09261ca4c273..21ddab565d48 100644
--- a/sys/dev/netmap/netmap_pipe.c
+++ b/sys/dev/netmap/netmap_pipe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2014-2018 Giuseppe Lettieri
* All rights reserved.
diff --git a/sys/dev/netmap/netmap_vale.c b/sys/dev/netmap/netmap_vale.c
index 540ebd2316d7..e8d8c38a6e67 100644
--- a/sys/dev/netmap/netmap_vale.c
+++ b/sys/dev/netmap/netmap_vale.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013-2016 Universita` di Pisa
* All rights reserved.
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 54b648bbf086..8753556451a0 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen
* Copyright (c) 2001-2004 Mark R. V. Murray
diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c
index 879f30e6135f..5592cd7660ed 100644
--- a/sys/dev/nvd/nvd.c
+++ b/sys/dev/nvd/nvd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2016 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvdimm/nvdimm_e820.c b/sys/dev/nvdimm/nvdimm_e820.c
index 0ba8cfbc7868..2ea092238434 100644
--- a/sys/dev/nvdimm/nvdimm_e820.c
+++ b/sys/dev/nvdimm/nvdimm_e820.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Dell EMC Isilon
*
diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c
index 512345ac9d8e..436b2f9735dd 100644
--- a/sys/dev/nvme/nvme.c
+++ b/sys/dev/nvme/nvme.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2014 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index 2e0fb27c1d99..420d8355e25e 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index bc5f1c7e218e..bcb90c5c758a 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2016 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c
index 46a3b90a90ec..156deceb00d1 100644
--- a/sys/dev/nvme/nvme_ctrlr_cmd.c
+++ b/sys/dev/nvme/nvme_ctrlr_cmd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c
index ba6960e476f8..657bcd1f94d8 100644
--- a/sys/dev/nvme/nvme_ns.c
+++ b/sys/dev/nvme/nvme_ns.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_ns_cmd.c b/sys/dev/nvme/nvme_ns_cmd.c
index 1bf92ec5e02a..e41e536ae91b 100644
--- a/sys/dev/nvme/nvme_ns_cmd.c
+++ b/sys/dev/nvme/nvme_ns_cmd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index c889246f9350..910bbae7999d 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2014 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index 3db29d01e884..8dd9a49b0a00 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2014 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c
index 4367a21861b3..b78a31703659 100644
--- a/sys/dev/nvme/nvme_sysctl.c
+++ b/sys/dev/nvme/nvme_sysctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2016 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c
index bd2c1dac3923..680f8237a676 100644
--- a/sys/dev/nvme/nvme_test.c
+++ b/sys/dev/nvme/nvme_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012-2013 Intel Corporation
* All rights reserved.
diff --git a/sys/dev/nvme/nvme_util.c b/sys/dev/nvme/nvme_util.c
index 6b9cb467fd49..8fe613b0217b 100644
--- a/sys/dev/nvme/nvme_util.c
+++ b/sys/dev/nvme/nvme_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013 Intel Corporation
* Copyright (C) 1997 Justin T. Gibbs
diff --git a/sys/dev/nvram/nvram.c b/sys/dev/nvram/nvram.c
index 683603825d01..25d2fe9b7168 100644
--- a/sys/dev/nvram/nvram.c
+++ b/sys/dev/nvram/nvram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Peter Wemm
* All rights reserved.
diff --git a/sys/dev/nvram2env/nvram2env.c b/sys/dev/nvram2env/nvram2env.c
index eb5d4c2ff1d0..8ba3127895f4 100644
--- a/sys/dev/nvram2env/nvram2env.c
+++ b/sys/dev/nvram2env/nvram2env.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Aleksandr Rybalko.
* All rights reserved.
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 7cbc5c05358c..fdba8e53a98a 100644
--- a/sys/dev/ofw/ofw_bus.h
+++ b/sys/dev/ofw/ofw_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2003 by Thomas Moestl <tmm@FreeBSD.org>
* Copyright (c) 2004 by Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c
index a630e4333fd9..5e290ac3112a 100644
--- a/sys/dev/ofw/ofw_bus_subr.c
+++ b/sys/dev/ofw/ofw_bus_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 - 2003 by Thomas Moestl <tmm@FreeBSD.org>.
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
index 0452e32001a0..fbe591293198 100644
--- a/sys/dev/ofw/ofw_bus_subr.h
+++ b/sys/dev/ofw/ofw_bus_subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index e4ed18b2d545..d085cad07c94 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Benno Rice.
* All rights reserved.
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 5975abcf7aae..98b609451707 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice <benno@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c
index 855bf6d5d14a..6cb98b6bf4e1 100644
--- a/sys/dev/ofw/ofw_fdt.c
+++ b/sys/dev/ofw/ofw_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
*
diff --git a/sys/dev/ofw/ofw_graph.c b/sys/dev/ofw/ofw_graph.c
index 0ef53486804d..0b267de57fd7 100644
--- a/sys/dev/ofw/ofw_graph.c
+++ b/sys/dev/ofw/ofw_graph.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/ofw/ofw_graph.h b/sys/dev/ofw/ofw_graph.h
index eecc2b76885e..549f3d2c2600 100644
--- a/sys/dev/ofw/ofw_graph.h
+++ b/sys/dev/ofw/ofw_graph.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/ofw/ofw_standard.c b/sys/dev/ofw/ofw_standard.c
index c2beabc0122f..c8916cd4fca8 100644
--- a/sys/dev/ofw/ofw_standard.c
+++ b/sys/dev/ofw/ofw_standard.c
@@ -1,7 +1,7 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
diff --git a/sys/dev/ofw/ofwvar.h b/sys/dev/ofw/ofwvar.h
index 08ab78ad28c5..9f3a8a66873e 100644
--- a/sys/dev/ofw/ofwvar.h
+++ b/sys/dev/ofw/ofwvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Grehan
* Copyright (c) 2008 Nathan Whitehorn
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index 53c8cdf88df8..31d38d2f8f9b 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -1,7 +1,7 @@
/* $NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $ */
/*-
- * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD)
+ * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause)
*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index 0fd841cd5720..567cee65cca3 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2004
* Diomidis D. Spinellis, Athens, Greece
diff --git a/sys/dev/pbio/pbioio.h b/sys/dev/pbio/pbioio.h
index 9d970f8bbc67..d7483c3b9aed 100644
--- a/sys/dev/pbio/pbioio.h
+++ b/sys/dev/pbio/pbioio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2004
* Diomidis D. Spinellis, Athens, Greece
diff --git a/sys/dev/pccard/pccard_device.c b/sys/dev/pccard/pccard_device.c
index 8b476a4074f4..7171360031d4 100644
--- a/sys/dev/pccard/pccard_device.c
+++ b/sys/dev/pccard/pccard_device.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/pccard/pccardvarp.h b/sys/dev/pccard/pccardvarp.h
index 16d7c07ac4ba..2d7d615da1a5 100644
--- a/sys/dev/pccard/pccardvarp.h
+++ b/sys/dev/pccard/pccardvarp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index cc733d6b798f..24033029a037 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Jonathan Chen All rights reserved.
* Copyright (c) 2002-2004 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 6de68f2759f6..2b63a5adab14 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Jonathan Chen All rights reserved.
* Copyright (c) 2002-2004 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index be159c495ca3..4e8f856fc458 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2004 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index 55597ec0cb72..515c21cdbf57 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index c900199c2508..c1bd671530b7 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Jonathan Chen All rights reserved.
* Copyright (c) 2003-2004 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index c91a3332d655..909285f7c761 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu, Marc Bouget
* Copyright (c) 2004 Joerg Wunsch
diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c
index ed345349c5c0..d345c3c315bf 100644
--- a/sys/dev/pcf/pcf_isa.c
+++ b/sys/dev/pcf/pcf_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Joerg Wunsch
*
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index c2f0becd42fe..6a63e09f82ec 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu, Marc Bouget
* Copyright (c) 2004 Joerg Wunsch
diff --git a/sys/dev/pci/hostb_pci.c b/sys/dev/pci/hostb_pci.c
index 814805554dbe..c19bb1d9fb39 100644
--- a/sys/dev/pci/hostb_pci.c
+++ b/sys/dev/pci/hostb_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1997, Stefan Esser <se@freebsd.org>
*
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 5a24b87367ec..b5a0633d5b9e 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/sys/dev/pci/ignore_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index b38311e41d84..065b7080f206 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
diff --git a/sys/dev/pci/pci_dw.c b/sys/dev/pci/pci_dw.c
index 2d33998d727d..3eacff6baaa0 100644
--- a/sys/dev/pci/pci_dw.c
+++ b/sys/dev/pci/pci_dw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/dev/pci/pci_dw.h b/sys/dev/pci/pci_dw.h
index 6f2248344f44..a21e672694a0 100644
--- a/sys/dev/pci/pci_dw.h
+++ b/sys/dev/pci/pci_dw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/dev/pci/pci_dw_mv.c b/sys/dev/pci/pci_dw_mv.c
index 43f45ddef54e..4fe5dd5dc46b 100644
--- a/sys/dev/pci/pci_dw_mv.c
+++ b/sys/dev/pci/pci_dw_mv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Michal Meloun <mmel@FreeBSD.org>
*
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index fec5db2e4ad5..6d5dd2203b1b 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index d00a576cf392..01267113b964 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 77d63c462ad9..4e5d279c3bc7 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1997, Stefan Esser <se@freebsd.org>
*
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 31cfc1503a57..24441d591a9e 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1997, Stefan Esser <se@freebsd.org>
*
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 3a444114027d..fad362dc7524 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1997, Stefan Esser <se@freebsd.org>
*
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 37334da00f80..95b0e436c3c1 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c
index bce511463d38..160d08951f92 100644
--- a/sys/dev/powermac_nvram/powermac_nvram.c
+++ b/sys/dev/powermac_nvram/powermac_nvram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/powermac_nvram/powermac_nvramvar.h b/sys/dev/powermac_nvram/powermac_nvramvar.h
index abc514357531..940d523e52a6 100644
--- a/sys/dev/powermac_nvram/powermac_nvramvar.h
+++ b/sys/dev/powermac_nvram/powermac_nvramvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 21307ff89b64..7844289e045d 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 9bf9eaec6ba2..4eee7b54e255 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu, Marc Bouget
* All rights reserved.
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 97628f334ac4..930b999d4d45 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 05285573ef95..2fe5000dcde6 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Sascha Schumann. All rights reserved.
*
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 52dfb27931ed..b075803d7573 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index 1ad05158fef9..ae7b4ecceb9a 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index b399f4cc2d17..ede351f341d0 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index 3b40a134f4bd..862533690ef4 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 1999 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 7ad23a8bf2c2..7c0ef1e25991 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 0c58e69e5909..559e2c6d0687 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 723db73412f8..23a2399c38d6 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppbio.h b/sys/dev/ppbus/ppbio.h
index ad019524a781..488b16c2a169 100644
--- a/sys/dev/ppbus/ppbio.h
+++ b/sys/dev/ppbus/ppbio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 3c467f10c055..fd98db6e3b5b 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu, Michael Smith
* All rights reserved.
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index b6f406a4aabb..c9e2299c0c76 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index afc9e4b2dd9f..ca360a9ed8e1 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c
index bb52b7370d16..828231dacbb5 100644
--- a/sys/dev/ppc/ppc_acpi.c
+++ b/sys/dev/ppc/ppc_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 869050050225..cdc1ba6a87ac 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c
index 58a34d0d2700..41fef8175921 100644
--- a/sys/dev/ppc/ppc_pci.c
+++ b/sys/dev/ppc/ppc_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index 42f77a450fb3..39ca3a7b158e 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* Copyright (c) 1997-2000 Nicolas Souchu
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index af5f5846be45..bceb907691c0 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alcove - Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index 08d7a6af4f33..122352b6ae10 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 809a389c76bc..1c6af239c2ca 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001,2002,2003 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/pty/pty.c b/sys/dev/pty/pty.c
index 656e05e18fba..9e5e7507b0bb 100644
--- a/sys/dev/pty/pty.c
+++ b/sys/dev/pty/pty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 2ecaaad4e05c..4ef883fa2eb3 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h
index 692a7f009019..8b2bb0e29bb7 100644
--- a/sys/dev/puc/puc_bfe.h
+++ b/sys/dev/puc/puc_bfe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/puc/puc_bus.h b/sys/dev/puc/puc_bus.h
index 71af1cfd4ce3..92845cf1b2e8 100644
--- a/sys/dev/puc/puc_bus.h
+++ b/sys/dev/puc/puc_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/puc/puc_cfg.c b/sys/dev/puc/puc_cfg.c
index e7f7f775dc7e..6aa7309bb365 100644
--- a/sys/dev/puc/puc_cfg.c
+++ b/sys/dev/puc/puc_cfg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/puc/puc_cfg.h b/sys/dev/puc/puc_cfg.h
index 490358053db7..b2c2d245c8ed 100644
--- a/sys/dev/puc/puc_cfg.h
+++ b/sys/dev/puc/puc_cfg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index 3432f6d33b6b..580a12983fcd 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -1,7 +1,7 @@
/* $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright (c) 2002 JF Hay. All rights reserved.
* Copyright (c) 2000 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 2c1c7a965dad..e8bf423b6ab4 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/pwm/ofw_pwm.c b/sys/dev/pwm/ofw_pwm.c
index 712cf874808f..2257cd93c3e3 100644
--- a/sys/dev/pwm/ofw_pwm.c
+++ b/sys/dev/pwm/ofw_pwm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/pwm/ofw_pwm.h b/sys/dev/pwm/ofw_pwm.h
index 89bb7cd5d9dc..b108701c4667 100644
--- a/sys/dev/pwm/ofw_pwm.h
+++ b/sys/dev/pwm/ofw_pwm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/pwm/ofw_pwmbus.c b/sys/dev/pwm/ofw_pwmbus.c
index 359c4f11272b..0272170d1094 100644
--- a/sys/dev/pwm/ofw_pwmbus.c
+++ b/sys/dev/pwm/ofw_pwmbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Ian Lepore <ian@FreeBSD.org>
*
diff --git a/sys/dev/pwm/pwm_backlight.c b/sys/dev/pwm/pwm_backlight.c
index 3a6ec7f61fec..ecf5e97d0b25 100644
--- a/sys/dev/pwm/pwm_backlight.c
+++ b/sys/dev/pwm/pwm_backlight.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/pwm/pwmbus.c b/sys/dev/pwm/pwmbus.c
index cacd21c07709..867cf30c5f54 100644
--- a/sys/dev/pwm/pwmbus.c
+++ b/sys/dev/pwm/pwmbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/pwm/pwmbus.h b/sys/dev/pwm/pwmbus.h
index 7ace2ef41b1b..8135588c06e0 100644
--- a/sys/dev/pwm/pwmbus.h
+++ b/sys/dev/pwm/pwmbus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Ian Lepore <ian@FreeBSD.org>
*
diff --git a/sys/dev/pwm/pwmbus_if.m b/sys/dev/pwm/pwmbus_if.m
index f81e92907847..353d378adfc9 100644
--- a/sys/dev/pwm/pwmbus_if.m
+++ b/sys/dev/pwm/pwmbus_if.m
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
#
diff --git a/sys/dev/pwm/pwmc.c b/sys/dev/pwm/pwmc.c
index b2f12add3e2b..2b3efb0ace9d 100644
--- a/sys/dev/pwm/pwmc.c
+++ b/sys/dev/pwm/pwmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/pwm/pwmc.h b/sys/dev/pwm/pwmc.h
index ad1f436e169c..3f34b4df5f30 100644
--- a/sys/dev/pwm/pwmc.h
+++ b/sys/dev/pwm/pwmc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/dev/qlxgb/qla_dbg.c b/sys/dev/qlxgb/qla_dbg.c
index 6db72ca0b490..11dcb765b584 100644
--- a/sys/dev/qlxgb/qla_dbg.c
+++ b/sys/dev/qlxgb/qla_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_dbg.h b/sys/dev/qlxgb/qla_dbg.h
index 59d8b526dcb1..7f64220986db 100644
--- a/sys/dev/qlxgb/qla_dbg.h
+++ b/sys/dev/qlxgb/qla_dbg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_def.h b/sys/dev/qlxgb/qla_def.h
index 69e1cd07c5bd..2b2c50226b46 100644
--- a/sys/dev/qlxgb/qla_def.h
+++ b/sys/dev/qlxgb/qla_def.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_glbl.h b/sys/dev/qlxgb/qla_glbl.h
index e9179685dc64..38e08ef8be5c 100644
--- a/sys/dev/qlxgb/qla_glbl.h
+++ b/sys/dev/qlxgb/qla_glbl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_hw.c b/sys/dev/qlxgb/qla_hw.c
index 3936a7399435..519c7dda227f 100644
--- a/sys/dev/qlxgb/qla_hw.c
+++ b/sys/dev/qlxgb/qla_hw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_hw.h b/sys/dev/qlxgb/qla_hw.h
index 5c1d2dcf8bd2..a8c9a8f38e9c 100644
--- a/sys/dev/qlxgb/qla_hw.h
+++ b/sys/dev/qlxgb/qla_hw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_inline.h b/sys/dev/qlxgb/qla_inline.h
index 91974815149a..1c838e097d97 100644
--- a/sys/dev/qlxgb/qla_inline.h
+++ b/sys/dev/qlxgb/qla_inline.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_ioctl.c b/sys/dev/qlxgb/qla_ioctl.c
index 3498450d6326..104f68931057 100644
--- a/sys/dev/qlxgb/qla_ioctl.c
+++ b/sys/dev/qlxgb/qla_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_ioctl.h b/sys/dev/qlxgb/qla_ioctl.h
index 860a1290f017..bc4880146f5d 100644
--- a/sys/dev/qlxgb/qla_ioctl.h
+++ b/sys/dev/qlxgb/qla_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_isr.c b/sys/dev/qlxgb/qla_isr.c
index 7966fc53b84f..6ef0a9da268d 100644
--- a/sys/dev/qlxgb/qla_isr.c
+++ b/sys/dev/qlxgb/qla_isr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_misc.c b/sys/dev/qlxgb/qla_misc.c
index 920a18bed7e8..02705ad4c200 100644
--- a/sys/dev/qlxgb/qla_misc.c
+++ b/sys/dev/qlxgb/qla_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c
index 9a8a02dfeb20..383856daea86 100644
--- a/sys/dev/qlxgb/qla_os.c
+++ b/sys/dev/qlxgb/qla_os.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_os.h b/sys/dev/qlxgb/qla_os.h
index fddae501b8b3..5679fe0bfd54 100644
--- a/sys/dev/qlxgb/qla_os.h
+++ b/sys/dev/qlxgb/qla_os.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_reg.h b/sys/dev/qlxgb/qla_reg.h
index 1f1083ad8d69..7a77870c5eee 100644
--- a/sys/dev/qlxgb/qla_reg.h
+++ b/sys/dev/qlxgb/qla_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgb/qla_ver.h b/sys/dev/qlxgb/qla_ver.h
index 84aa3d00ceb4..82c7fb8b0326 100644
--- a/sys/dev/qlxgb/qla_ver.h
+++ b/sys/dev/qlxgb/qla_ver.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_dbg.c b/sys/dev/qlxgbe/ql_dbg.c
index 1a683d54506e..bc93ae520c2b 100644
--- a/sys/dev/qlxgbe/ql_dbg.c
+++ b/sys/dev/qlxgbe/ql_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_dbg.h b/sys/dev/qlxgbe/ql_dbg.h
index 22a5cc20c488..26ce55ad268c 100644
--- a/sys/dev/qlxgbe/ql_dbg.h
+++ b/sys/dev/qlxgbe/ql_dbg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_def.h b/sys/dev/qlxgbe/ql_def.h
index c8ddb4f8959b..a91ecd460a09 100644
--- a/sys/dev/qlxgbe/ql_def.h
+++ b/sys/dev/qlxgbe/ql_def.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_glbl.h b/sys/dev/qlxgbe/ql_glbl.h
index 277c60560d79..38ece07c2a16 100644
--- a/sys/dev/qlxgbe/ql_glbl.h
+++ b/sys/dev/qlxgbe/ql_glbl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index 717089427d0a..5b4e94cf5cec 100644
--- a/sys/dev/qlxgbe/ql_hw.c
+++ b/sys/dev/qlxgbe/ql_hw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_hw.h b/sys/dev/qlxgbe/ql_hw.h
index 935bf397b1eb..294604017021 100644
--- a/sys/dev/qlxgbe/ql_hw.h
+++ b/sys/dev/qlxgbe/ql_hw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_inline.h b/sys/dev/qlxgbe/ql_inline.h
index 6b0eecfd34b3..29d560e3070d 100644
--- a/sys/dev/qlxgbe/ql_inline.h
+++ b/sys/dev/qlxgbe/ql_inline.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_ioctl.c b/sys/dev/qlxgbe/ql_ioctl.c
index 76de52ed6d04..9bd67d20a3d8 100644
--- a/sys/dev/qlxgbe/ql_ioctl.c
+++ b/sys/dev/qlxgbe/ql_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_ioctl.h b/sys/dev/qlxgbe/ql_ioctl.h
index 39de0989fec2..323ce9e7dc78 100644
--- a/sys/dev/qlxgbe/ql_ioctl.h
+++ b/sys/dev/qlxgbe/ql_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_isr.c b/sys/dev/qlxgbe/ql_isr.c
index 0d1ae164c7ae..1d3ac34d7cf1 100644
--- a/sys/dev/qlxgbe/ql_isr.c
+++ b/sys/dev/qlxgbe/ql_isr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_misc.c b/sys/dev/qlxgbe/ql_misc.c
index d7729b68cb6e..b6ed814ab1cc 100644
--- a/sys/dev/qlxgbe/ql_misc.c
+++ b/sys/dev/qlxgbe/ql_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c
index f83ae6022bd1..83ad0f4bd848 100644
--- a/sys/dev/qlxgbe/ql_os.c
+++ b/sys/dev/qlxgbe/ql_os.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_os.h b/sys/dev/qlxgbe/ql_os.h
index fcee6e740828..7a50c21cc633 100644
--- a/sys/dev/qlxgbe/ql_os.h
+++ b/sys/dev/qlxgbe/ql_os.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_reset.c b/sys/dev/qlxgbe/ql_reset.c
index d54025106400..5e40047d0d02 100644
--- a/sys/dev/qlxgbe/ql_reset.c
+++ b/sys/dev/qlxgbe/ql_reset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_tmplt.h b/sys/dev/qlxgbe/ql_tmplt.h
index 98fb9dc9013f..8335755ff294 100644
--- a/sys/dev/qlxgbe/ql_tmplt.h
+++ b/sys/dev/qlxgbe/ql_tmplt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxgbe/ql_ver.h b/sys/dev/qlxgbe/ql_ver.h
index 829832a1d0dd..d5575992b52b 100644
--- a/sys/dev/qlxgbe/ql_ver.h
+++ b/sys/dev/qlxgbe/ql_ver.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2016 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_dbg.c b/sys/dev/qlxge/qls_dbg.c
index 8d863ea86671..722590736792 100644
--- a/sys/dev/qlxge/qls_dbg.c
+++ b/sys/dev/qlxge/qls_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_dbg.h b/sys/dev/qlxge/qls_dbg.h
index 5f07cbfa8937..182673ddb724 100644
--- a/sys/dev/qlxge/qls_dbg.h
+++ b/sys/dev/qlxge/qls_dbg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_def.h b/sys/dev/qlxge/qls_def.h
index 47da2403d530..dc70020f1768 100644
--- a/sys/dev/qlxge/qls_def.h
+++ b/sys/dev/qlxge/qls_def.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_dump.c b/sys/dev/qlxge/qls_dump.c
index 952107e351be..96b43d715931 100644
--- a/sys/dev/qlxge/qls_dump.c
+++ b/sys/dev/qlxge/qls_dump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_dump.h b/sys/dev/qlxge/qls_dump.h
index 268c1aed1bff..1d1fca39d9b8 100644
--- a/sys/dev/qlxge/qls_dump.h
+++ b/sys/dev/qlxge/qls_dump.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_glbl.h b/sys/dev/qlxge/qls_glbl.h
index de3ff44fc3d5..f50313efab6d 100644
--- a/sys/dev/qlxge/qls_glbl.h
+++ b/sys/dev/qlxge/qls_glbl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_hw.c b/sys/dev/qlxge/qls_hw.c
index ca97826c76dc..96f0dcbc2c75 100644
--- a/sys/dev/qlxge/qls_hw.c
+++ b/sys/dev/qlxge/qls_hw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_hw.h b/sys/dev/qlxge/qls_hw.h
index 8de18afd9b33..19063c6bd480 100644
--- a/sys/dev/qlxge/qls_hw.h
+++ b/sys/dev/qlxge/qls_hw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_inline.h b/sys/dev/qlxge/qls_inline.h
index f280bf5fb701..b03fa30e1f32 100644
--- a/sys/dev/qlxge/qls_inline.h
+++ b/sys/dev/qlxge/qls_inline.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_ioctl.c b/sys/dev/qlxge/qls_ioctl.c
index 1ce380d9c5eb..801eb2c9532e 100644
--- a/sys/dev/qlxge/qls_ioctl.c
+++ b/sys/dev/qlxge/qls_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_ioctl.h b/sys/dev/qlxge/qls_ioctl.h
index 3ea344183e9f..abe718bcbd6f 100644
--- a/sys/dev/qlxge/qls_ioctl.h
+++ b/sys/dev/qlxge/qls_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_isr.c b/sys/dev/qlxge/qls_isr.c
index 38da2d2c3408..f8fc84680997 100644
--- a/sys/dev/qlxge/qls_isr.c
+++ b/sys/dev/qlxge/qls_isr.c
@@ -1,7 +1,7 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c
index 3eca6f20f531..3d074e15b003 100644
--- a/sys/dev/qlxge/qls_os.c
+++ b/sys/dev/qlxge/qls_os.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_os.h b/sys/dev/qlxge/qls_os.h
index b10a37ecd5d3..0591d53748f1 100644
--- a/sys/dev/qlxge/qls_os.h
+++ b/sys/dev/qlxge/qls_os.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/qlxge/qls_ver.h b/sys/dev/qlxge/qls_ver.h
index de3b66fb62dd..0960e61b5d09 100644
--- a/sys/dev/qlxge/qls_ver.h
+++ b/sys/dev/qlxge/qls_ver.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Qlogic Corporation
* All rights reserved.
diff --git a/sys/dev/quicc/quicc_bus.h b/sys/dev/quicc/quicc_bus.h
index a12e6d681b87..18d17589e391 100644
--- a/sys/dev/quicc/quicc_bus.h
+++ b/sys/dev/quicc/quicc_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/random/fenestrasX/fx_brng.c b/sys/dev/random/fenestrasX/fx_brng.c
index 9e915134e794..6071d551942f 100644
--- a/sys/dev/random/fenestrasX/fx_brng.c
+++ b/sys/dev/random/fenestrasX/fx_brng.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_brng.h b/sys/dev/random/fenestrasX/fx_brng.h
index 192f1ecc61d2..862795ffc66a 100644
--- a/sys/dev/random/fenestrasX/fx_brng.h
+++ b/sys/dev/random/fenestrasX/fx_brng.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_hash.h b/sys/dev/random/fenestrasX/fx_hash.h
index 226958623b52..2f158f77e5c9 100644
--- a/sys/dev/random/fenestrasX/fx_hash.h
+++ b/sys/dev/random/fenestrasX/fx_hash.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_main.c b/sys/dev/random/fenestrasX/fx_main.c
index 7d4c6cd5d232..141ab8c5a54c 100644
--- a/sys/dev/random/fenestrasX/fx_main.c
+++ b/sys/dev/random/fenestrasX/fx_main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c
index b6cc0dad349d..26ec7358159c 100644
--- a/sys/dev/random/fenestrasX/fx_pool.c
+++ b/sys/dev/random/fenestrasX/fx_pool.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_pool.h b/sys/dev/random/fenestrasX/fx_pool.h
index 36300196e5af..a301ad8c0b42 100644
--- a/sys/dev/random/fenestrasX/fx_pool.h
+++ b/sys/dev/random/fenestrasX/fx_pool.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_priv.h b/sys/dev/random/fenestrasX/fx_priv.h
index 5760140a5336..5a9fa5cd9531 100644
--- a/sys/dev/random/fenestrasX/fx_priv.h
+++ b/sys/dev/random/fenestrasX/fx_priv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_pub.h b/sys/dev/random/fenestrasX/fx_pub.h
index cb6eebe1c963..5e9aac46b327 100644
--- a/sys/dev/random/fenestrasX/fx_pub.h
+++ b/sys/dev/random/fenestrasX/fx_pub.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_rng.c b/sys/dev/random/fenestrasX/fx_rng.c
index 7980d93aaa89..49730d040762 100644
--- a/sys/dev/random/fenestrasX/fx_rng.c
+++ b/sys/dev/random/fenestrasX/fx_rng.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/random/fenestrasX/fx_rng.h b/sys/dev/random/fenestrasX/fx_rng.h
index 467ae8b79546..e9cc07d90a3e 100644
--- a/sys/dev/random/fenestrasX/fx_rng.h
+++ b/sys/dev/random/fenestrasX/fx_rng.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index 91fa165bab69..560b37619f16 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016, Stanislav Galabov
* Copyright (c) 2014, Aleksandr A. Mityaev
diff --git a/sys/dev/rt/if_rtreg.h b/sys/dev/rt/if_rtreg.h
index 551b14d2ca10..35076b6f2747 100644
--- a/sys/dev/rt/if_rtreg.h
+++ b/sys/dev/rt/if_rtreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Aleksandr Rybalko
* All rights reserved.
diff --git a/sys/dev/rt/if_rtvar.h b/sys/dev/rt/if_rtvar.h
index aa1fd8da00d6..447215304d4a 100644
--- a/sys/dev/rt/if_rtvar.h
+++ b/sys/dev/rt/if_rtvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Aleksandr Rybalko <ray@ddteam.net>
* Copyright (c) 2009-2010 Alexander Egorenkov <egorenar@gmail.com>
diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c
index f706c4ac9025..62813bed40dc 100644
--- a/sys/dev/rtsx/rtsx.c
+++ b/sys/dev/rtsx/rtsx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
* Copyright (c) 2012 Stefan Sperling <stsp@openbsd.org>
diff --git a/sys/dev/rtsx/rtsxreg.h b/sys/dev/rtsx/rtsxreg.h
index 6032570e64e4..af528f850eb0 100644
--- a/sys/dev/rtsx/rtsxreg.h
+++ b/sys/dev/rtsx/rtsxreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
* Copyright (c) 2012 Stefan Sperling <stsp@openbsd.org>
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 7fc5c9c80929..0095dc8fe9a4 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2003 Global Technology Associates, Inc.
diff --git a/sys/dev/safe/safereg.h b/sys/dev/safe/safereg.h
index e7b92c9f459f..44ac06c592f2 100644
--- a/sys/dev/safe/safereg.h
+++ b/sys/dev/safe/safereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2003 Global Technology Associates, Inc.
diff --git a/sys/dev/safe/safevar.h b/sys/dev/safe/safevar.h
index e7d238669ed6..16e60c0e1f64 100644
--- a/sys/dev/safe/safevar.h
+++ b/sys/dev/safe/safevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2003 Global Technology Associates, Inc.
diff --git a/sys/dev/safexcel/safexcel.c b/sys/dev/safexcel/safexcel.c
index afb9a51ce2e3..59da2b9f9ad9 100644
--- a/sys/dev/safexcel/safexcel.c
+++ b/sys/dev/safexcel/safexcel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020, 2021 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2021 The FreeBSD Foundation
diff --git a/sys/dev/safexcel/safexcel_reg.h b/sys/dev/safexcel/safexcel_reg.h
index 5aa806409147..78274ca86714 100644
--- a/sys/dev/safexcel/safexcel_reg.h
+++ b/sys/dev/safexcel/safexcel_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/dev/safexcel/safexcel_var.h b/sys/dev/safexcel/safexcel_var.h
index efcf66a090bf..85f779d03095 100644
--- a/sys/dev/safexcel/safexcel_var.h
+++ b/sys/dev/safexcel/safexcel_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h
index 303bdfd6d75d..4d57d1b138a8 100644
--- a/sys/dev/scc/scc_bfe.h
+++ b/sys/dev/scc/scc_bfe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/scc/scc_bfe_macio.c b/sys/dev/scc/scc_bfe_macio.c
index 241f6c072a2c..6bd3f9c15e8a 100644
--- a/sys/dev/scc/scc_bfe_macio.c
+++ b/sys/dev/scc/scc_bfe_macio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/scc/scc_bfe_quicc.c b/sys/dev/scc/scc_bfe_quicc.c
index 6f047b75a4ee..b334e0805696 100644
--- a/sys/dev/scc/scc_bfe_quicc.c
+++ b/sys/dev/scc/scc_bfe_quicc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/scc/scc_bus.h b/sys/dev/scc/scc_bus.h
index 08fcd2626fa5..1f2f76bc353d 100644
--- a/sys/dev/scc/scc_bus.h
+++ b/sys/dev/scc/scc_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/scc/scc_core.c b/sys/dev/scc/scc_core.c
index b5a8fe4fda19..bb6aef9e3bd6 100644
--- a/sys/dev/scc/scc_core.c
+++ b/sys/dev/scc/scc_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/scc/scc_dev_quicc.c b/sys/dev/scc/scc_dev_quicc.c
index b73402a90941..20633d13419e 100644
--- a/sys/dev/scc/scc_dev_quicc.c
+++ b/sys/dev/scc/scc_dev_quicc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/scc/scc_dev_z8530.c b/sys/dev/scc/scc_dev_z8530.c
index 6255ebd06c7c..050a84d2821b 100644
--- a/sys/dev/scc/scc_dev_z8530.c
+++ b/sys/dev/scc/scc_dev_z8530.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index 39053229abb1..6094e49f2cfa 100644
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
diff --git a/sys/dev/sdhci/sdhci.h b/sys/dev/sdhci/sdhci.h
index e0f7a7bd0090..9dd5bede8d21 100644
--- a/sys/dev/sdhci/sdhci.h
+++ b/sys/dev/sdhci/sdhci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
index 51b009a411c8..217f72e98296 100644
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Thomas Skibo
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c
index d9b7d1954a1d..5fac21a2172e 100644
--- a/sys/dev/sdhci/sdhci_fsl_fdt.c
+++ b/sys/dev/sdhci/sdhci_fsl_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alstom Group.
* Copyright (c) 2020 Semihalf.
diff --git a/sys/dev/sdhci/sdhci_pci.c b/sys/dev/sdhci/sdhci_pci.c
index 5d22a819410c..9d5c6420cf44 100644
--- a/sys/dev/sdhci/sdhci_pci.c
+++ b/sys/dev/sdhci/sdhci_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c
index 78428052f0fc..e40ff9ba77c0 100644
--- a/sys/dev/sdhci/sdhci_xenon.c
+++ b/sys/dev/sdhci/sdhci_xenon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
* All rights reserved.
diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c b/sys/dev/sdhci/sdhci_xenon_acpi.c
index 9bb781ff75a6..5339376fc9e3 100644
--- a/sys/dev/sdhci/sdhci_xenon_acpi.c
+++ b/sys/dev/sdhci/sdhci_xenon_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Semihalf
*
diff --git a/sys/dev/sdhci/sdhci_xenon_fdt.c b/sys/dev/sdhci/sdhci_xenon_fdt.c
index 2d96105bd7e9..2aefd6ed482b 100644
--- a/sys/dev/sdhci/sdhci_xenon_fdt.c
+++ b/sys/dev/sdhci/sdhci_xenon_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Semihalf
*
diff --git a/sys/dev/sec/sec.c b/sys/dev/sec/sec.c
index f485d932727b..d02d2cd15fef 100644
--- a/sys/dev/sec/sec.c
+++ b/sys/dev/sec/sec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
* All rights reserved.
diff --git a/sys/dev/sec/sec.h b/sys/dev/sec/sec.h
index 6ad482316a54..16077b9db25b 100644
--- a/sys/dev/sec/sec.h
+++ b/sys/dev/sec/sec.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
* All rights reserved.
diff --git a/sys/dev/sfxge/common/ef10_image.c b/sys/dev/sfxge/common/ef10_image.c
index 10322edd23dd..bf7ac6b28f98 100644
--- a/sys/dev/sfxge/common/ef10_image.c
+++ b/sys/dev/sfxge/common/ef10_image.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017-2018 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/ef10_signed_image_layout.h b/sys/dev/sfxge/common/ef10_signed_image_layout.h
index 2a1c2e29b372..7024531ac683 100644
--- a/sys/dev/sfxge/common/ef10_signed_image_layout.h
+++ b/sys/dev/sfxge/common/ef10_signed_image_layout.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efsys.h b/sys/dev/sfxge/common/efsys.h
index 1ba130c96755..3c27effd3f19 100644
--- a/sys/dev/sfxge/common/efsys.h
+++ b/sys/dev/sfxge/common/efsys.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx.h b/sys/dev/sfxge/common/efx.h
index 383a271fb7ec..69dcc510e12e 100644
--- a/sys/dev/sfxge/common/efx.h
+++ b/sys/dev/sfxge/common/efx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_annote.h b/sys/dev/sfxge/common/efx_annote.h
index e281efb7f697..c99dd3b979cf 100644
--- a/sys/dev/sfxge/common/efx_annote.h
+++ b/sys/dev/sfxge/common/efx_annote.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_bootcfg.c b/sys/dev/sfxge/common/efx_bootcfg.c
index bbab4095d7ef..8f9c017022a2 100644
--- a/sys/dev/sfxge/common/efx_bootcfg.c
+++ b/sys/dev/sfxge/common/efx_bootcfg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_ev.c b/sys/dev/sfxge/common/efx_ev.c
index 756b63d2a3df..d5ce38daaa1f 100644
--- a/sys/dev/sfxge/common/efx_ev.c
+++ b/sys/dev/sfxge/common/efx_ev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_filter.c b/sys/dev/sfxge/common/efx_filter.c
index 34e0c4fa36cb..530d0bb7e634 100644
--- a/sys/dev/sfxge/common/efx_filter.c
+++ b/sys/dev/sfxge/common/efx_filter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_impl.h b/sys/dev/sfxge/common/efx_impl.h
index 20ad63efe690..93deee2412fe 100644
--- a/sys/dev/sfxge/common/efx_impl.h
+++ b/sys/dev/sfxge/common/efx_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_intr.c b/sys/dev/sfxge/common/efx_intr.c
index 423020a59320..bdd42449c4d3 100644
--- a/sys/dev/sfxge/common/efx_intr.c
+++ b/sys/dev/sfxge/common/efx_intr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_mac.c b/sys/dev/sfxge/common/efx_mac.c
index b107a0311894..d575d9ae06cc 100644
--- a/sys/dev/sfxge/common/efx_mac.c
+++ b/sys/dev/sfxge/common/efx_mac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_mcdi.c b/sys/dev/sfxge/common/efx_mcdi.c
index 3f4f8882d010..6395ced58f89 100644
--- a/sys/dev/sfxge/common/efx_mcdi.c
+++ b/sys/dev/sfxge/common/efx_mcdi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_mcdi.h b/sys/dev/sfxge/common/efx_mcdi.h
index 480f3f4f46fc..58931991b321 100644
--- a/sys/dev/sfxge/common/efx_mcdi.h
+++ b/sys/dev/sfxge/common/efx_mcdi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_mon.c b/sys/dev/sfxge/common/efx_mon.c
index 9988db9545c3..574ce723530c 100644
--- a/sys/dev/sfxge/common/efx_mon.c
+++ b/sys/dev/sfxge/common/efx_mon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_nic.c b/sys/dev/sfxge/common/efx_nic.c
index 0fe5045f73c2..4972d7881f41 100644
--- a/sys/dev/sfxge/common/efx_nic.c
+++ b/sys/dev/sfxge/common/efx_nic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_nvram.c b/sys/dev/sfxge/common/efx_nvram.c
index c6518ca2eac5..e76345d2a169 100644
--- a/sys/dev/sfxge/common/efx_nvram.c
+++ b/sys/dev/sfxge/common/efx_nvram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_phy.c b/sys/dev/sfxge/common/efx_phy.c
index 956701f1a2d8..1c87eb188d80 100644
--- a/sys/dev/sfxge/common/efx_phy.c
+++ b/sys/dev/sfxge/common/efx_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_port.c b/sys/dev/sfxge/common/efx_port.c
index f3f21055a09c..441e2307e687 100644
--- a/sys/dev/sfxge/common/efx_port.c
+++ b/sys/dev/sfxge/common/efx_port.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_regs.h b/sys/dev/sfxge/common/efx_regs.h
index 9593e3102ebd..e98fd8bdc423 100644
--- a/sys/dev/sfxge/common/efx_regs.h
+++ b/sys/dev/sfxge/common/efx_regs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_regs_ef10.h b/sys/dev/sfxge/common/efx_regs_ef10.h
index 3403e50b5b66..b91f279c231e 100644
--- a/sys/dev/sfxge/common/efx_regs_ef10.h
+++ b/sys/dev/sfxge/common/efx_regs_ef10.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_regs_mcdi.h b/sys/dev/sfxge/common/efx_regs_mcdi.h
index 53c0ed336418..a89fe8a7f5eb 100644
--- a/sys/dev/sfxge/common/efx_regs_mcdi.h
+++ b/sys/dev/sfxge/common/efx_regs_mcdi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008-2013 Solarflare Communications Inc. All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_regs_mcdi_aoe.h b/sys/dev/sfxge/common/efx_regs_mcdi_aoe.h
index 378d62aa37f3..4a8f0c4009cf 100644
--- a/sys/dev/sfxge/common/efx_regs_mcdi_aoe.h
+++ b/sys/dev/sfxge/common/efx_regs_mcdi_aoe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008-2018 Solarflare Communications Inc. All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_regs_mcdi_strs.h b/sys/dev/sfxge/common/efx_regs_mcdi_strs.h
index 110810f69536..6754ea76cf66 100644
--- a/sys/dev/sfxge/common/efx_regs_mcdi_strs.h
+++ b/sys/dev/sfxge/common/efx_regs_mcdi_strs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008-2018 Solarflare Communications Inc. All rights reserved.
*
diff --git a/sys/dev/sfxge/common/efx_regs_pci.h b/sys/dev/sfxge/common/efx_regs_pci.h
index c321a38d9a2f..89aa97f19256 100644
--- a/sys/dev/sfxge/common/efx_regs_pci.h
+++ b/sys/dev/sfxge/common/efx_regs_pci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_rx.c b/sys/dev/sfxge/common/efx_rx.c
index b2c89199e486..20cd3c88a8b5 100644
--- a/sys/dev/sfxge/common/efx_rx.c
+++ b/sys/dev/sfxge/common/efx_rx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_sram.c b/sys/dev/sfxge/common/efx_sram.c
index 32007952fb2f..e64b49462680 100644
--- a/sys/dev/sfxge/common/efx_sram.c
+++ b/sys/dev/sfxge/common/efx_sram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_tunnel.c b/sys/dev/sfxge/common/efx_tunnel.c
index 21f50f3aec48..fdeecee82ee6 100644
--- a/sys/dev/sfxge/common/efx_tunnel.c
+++ b/sys/dev/sfxge/common/efx_tunnel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017-2018 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_tx.c b/sys/dev/sfxge/common/efx_tx.c
index 10aa7e8060ba..af24a7d67310 100644
--- a/sys/dev/sfxge/common/efx_tx.c
+++ b/sys/dev/sfxge/common/efx_tx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_types.h b/sys/dev/sfxge/common/efx_types.h
index 67ddd3cbad54..7d30cc548891 100644
--- a/sys/dev/sfxge/common/efx_types.h
+++ b/sys/dev/sfxge/common/efx_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/efx_vpd.c b/sys/dev/sfxge/common/efx_vpd.c
index daebf40d8c89..7191c66e8d0c 100644
--- a/sys/dev/sfxge/common/efx_vpd.c
+++ b/sys/dev/sfxge/common/efx_vpd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/medford2_impl.h b/sys/dev/sfxge/common/medford2_impl.h
index 5d19c6bd8bf5..f49753abad19 100644
--- a/sys/dev/sfxge/common/medford2_impl.h
+++ b/sys/dev/sfxge/common/medford2_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2018 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/medford2_nic.c b/sys/dev/sfxge/common/medford2_nic.c
index e25cbb7ff0e3..4e5ecdac038e 100644
--- a/sys/dev/sfxge/common/medford2_nic.c
+++ b/sys/dev/sfxge/common/medford2_nic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2018 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_flash.h b/sys/dev/sfxge/common/siena_flash.h
index 2f800bf9d65b..4cb8eb03e5a3 100644
--- a/sys/dev/sfxge/common/siena_flash.h
+++ b/sys/dev/sfxge/common/siena_flash.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_impl.h b/sys/dev/sfxge/common/siena_impl.h
index 85fa4298d15a..d87348a2dc61 100644
--- a/sys/dev/sfxge/common/siena_impl.h
+++ b/sys/dev/sfxge/common/siena_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_mac.c b/sys/dev/sfxge/common/siena_mac.c
index 6a5840691d91..b1218dd3f385 100644
--- a/sys/dev/sfxge/common/siena_mac.c
+++ b/sys/dev/sfxge/common/siena_mac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_nic.c b/sys/dev/sfxge/common/siena_nic.c
index 01251fdf7800..2c508653bc56 100644
--- a/sys/dev/sfxge/common/siena_nic.c
+++ b/sys/dev/sfxge/common/siena_nic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_nvram.c b/sys/dev/sfxge/common/siena_nvram.c
index c3fcd054150b..a9d90fdd1852 100644
--- a/sys/dev/sfxge/common/siena_nvram.c
+++ b/sys/dev/sfxge/common/siena_nvram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_phy.c b/sys/dev/sfxge/common/siena_phy.c
index 3a4b51831396..d41cf7c3955d 100644
--- a/sys/dev/sfxge/common/siena_phy.c
+++ b/sys/dev/sfxge/common/siena_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_sram.c b/sys/dev/sfxge/common/siena_sram.c
index b3d17e2fac3a..8e0f72b654c0 100644
--- a/sys/dev/sfxge/common/siena_sram.c
+++ b/sys/dev/sfxge/common/siena_sram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/common/siena_vpd.c b/sys/dev/sfxge/common/siena_vpd.c
index ee66ada4d7c1..4c7835a966d4 100644
--- a/sys/dev/sfxge/common/siena_vpd.c
+++ b/sys/dev/sfxge/common/siena_vpd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
index 62daadf35ae5..edee826a7e77 100644
--- a/sys/dev/sfxge/sfxge.c
+++ b/sys/dev/sfxge/sfxge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge.h b/sys/dev/sfxge/sfxge.h
index 07e7ede97309..31b7e8173e06 100644
--- a/sys/dev/sfxge/sfxge.h
+++ b/sys/dev/sfxge/sfxge.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_dma.c b/sys/dev/sfxge/sfxge_dma.c
index 52b4403b3f97..1f5e05c37259 100644
--- a/sys/dev/sfxge/sfxge_dma.c
+++ b/sys/dev/sfxge/sfxge_dma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_ev.c b/sys/dev/sfxge/sfxge_ev.c
index 9356e01efeff..06759042069c 100644
--- a/sys/dev/sfxge/sfxge_ev.c
+++ b/sys/dev/sfxge/sfxge_ev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_intr.c b/sys/dev/sfxge/sfxge_intr.c
index 5f6b1bbcc94b..27740cbd0a57 100644
--- a/sys/dev/sfxge/sfxge_intr.c
+++ b/sys/dev/sfxge/sfxge_intr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_mcdi.c b/sys/dev/sfxge/sfxge_mcdi.c
index 00aaa73027a8..0e4b352b0118 100644
--- a/sys/dev/sfxge/sfxge_mcdi.c
+++ b/sys/dev/sfxge/sfxge_mcdi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_port.c b/sys/dev/sfxge/sfxge_port.c
index 2100d1d647cd..db256d8d3b21 100644
--- a/sys/dev/sfxge/sfxge_port.c
+++ b/sys/dev/sfxge/sfxge_port.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_rx.c b/sys/dev/sfxge/sfxge_rx.c
index 111e1ee5b880..886d0eab3e9a 100644
--- a/sys/dev/sfxge/sfxge_rx.c
+++ b/sys/dev/sfxge/sfxge_rx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_rx.h b/sys/dev/sfxge/sfxge_rx.h
index 53077e2f76b5..ebec4443a326 100644
--- a/sys/dev/sfxge/sfxge_rx.h
+++ b/sys/dev/sfxge/sfxge_rx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_tx.c b/sys/dev/sfxge/sfxge_tx.c
index 663b4e99270f..3f1424a89372 100644
--- a/sys/dev/sfxge/sfxge_tx.c
+++ b/sys/dev/sfxge/sfxge_tx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/sfxge/sfxge_tx.h b/sys/dev/sfxge/sfxge_tx.h
index 4446eb51a238..f82ad4e11033 100644
--- a/sys/dev/sfxge/sfxge_tx.h
+++ b/sys/dev/sfxge/sfxge_tx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2016 Solarflare Communications Inc.
* All rights reserved.
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 1c0000e89b07..3c146ff84003 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/siis/siis.h b/sys/dev/siis/siis.h
index dac43cf2dfd4..7a26f5611ce7 100644
--- a/sys/dev/siis/siis.h
+++ b/sys/dev/siis/siis.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c
index f3519634e1a4..24a205a05fed 100644
--- a/sys/dev/smbios/smbios.c
+++ b/sys/dev/smbios/smbios.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
diff --git a/sys/dev/smbios/smbios.h b/sys/dev/smbios/smbios.h
index ec216b676f2b..a12bd4d81405 100644
--- a/sys/dev/smbios/smbios.h
+++ b/sys/dev/smbios/smbios.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index b9916dd29a7f..6806d04e1db6 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index ed01adc663d3..3ef7716332d9 100644
--- a/sys/dev/smbus/smb.h
+++ b/sys/dev/smbus/smb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 129c9f38e174..8899e31170eb 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index 37eb1ab6ab67..4a8a7f1a97c5 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index d6b4d9ab78b6..0ec551949013 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998, 2001 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index 9f15c7741e7f..3b621f638f78 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Nicolas Souchu
* All rights reserved.
diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c
index 830a8af82923..f7be1473a655 100644
--- a/sys/dev/smc/if_smc.c
+++ b/sys/dev/smc/if_smc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Benno Rice. All rights reserved.
*
diff --git a/sys/dev/smc/if_smcreg.h b/sys/dev/smc/if_smcreg.h
index 2705cff1dee5..74f7df48dd55 100644
--- a/sys/dev/smc/if_smcreg.h
+++ b/sys/dev/smc/if_smcreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Benno Rice. All rights reserved.
*
diff --git a/sys/dev/smc/if_smcvar.h b/sys/dev/smc/if_smcvar.h
index f7d3944d817d..a2c8f6953822 100644
--- a/sys/dev/smc/if_smcvar.h
+++ b/sys/dev/smc/if_smcvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Benno Rice. All rights reserved.
*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 37c1c075a76e..3dd501704a56 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h
index 6b3200354fd9..a3baa410c53a 100644
--- a/sys/dev/sound/chip.h
+++ b/sys/dev/sound/chip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/clone.c b/sys/dev/sound/clone.c
index 7d3148750a1e..edd48e15d75b 100644
--- a/sys/dev/sound/clone.c
+++ b/sys/dev/sound/clone.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/clone.h b/sys/dev/sound/clone.h
index bcfa504ad003..d5efcf6941aa 100644
--- a/sys/dev/sound/clone.h
+++ b/sys/dev/sound/clone.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index 06833430edb4..d0d2bbe77ca8 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 73bad65b3c1d..c41eff8ea1be 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index ce906047d051..6206480af54f 100644
--- a/sys/dev/sound/isa/ad1816.h
+++ b/sys/dev/sound/isa/ad1816.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Luigi Rizzo
* All rights reserved.
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index ffdf60a8d2aa..a185e9e46b80 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 6fd49ca1ea7e..061c432cd2d3 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* Copyright (c) 1999 Ville-Pertti Keinonen
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 143baa8c64f0..faffaa49677e 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 George Reid <greid@ukug.uk.freebsd.org>
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index 58ad1e230043..76227c2928df 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* Copyright (c) 1997 Luigi Rizzo
diff --git a/sys/dev/sound/isa/sb.h b/sys/dev/sound/isa/sb.h
index 2af32a03e5c4..3dfd5bbf3f70 100644
--- a/sys/dev/sound/isa/sb.h
+++ b/sys/dev/sound/isa/sb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997,1998 Luigi Rizzo
* All rights reserved.
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index a956b8a6c595..669d83b80d9e 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index b4e9d98232ba..5e4c048df739 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 1997,1998 Luigi Rizzo
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 3c6dd3bba97d..376bcd747baa 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c
index 9d41c5292970..eb3252552e37 100644
--- a/sys/dev/sound/isa/sndbuf_dma.c
+++ b/sys/dev/sound/isa/sndbuf_dma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c
index 04a29d3030b6..015193cf0cd9 100644
--- a/sys/dev/sound/macio/aoa.c
+++ b/sys/dev/sound/macio/aoa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/macio/aoa.h b/sys/dev/sound/macio/aoa.h
index a6875fbaacf6..eba1c9fd8140 100644
--- a/sys/dev/sound/macio/aoa.h
+++ b/sys/dev/sound/macio/aoa.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c
index c174ec155416..9bdbcb658263 100644
--- a/sys/dev/sound/macio/davbus.c
+++ b/sys/dev/sound/macio/davbus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/macio/davbusreg.h b/sys/dev/sound/macio/davbusreg.h
index 8b5a8ccefa65..fec4e8810e29 100644
--- a/sys/dev/sound/macio/davbusreg.h
+++ b/sys/dev/sound/macio/davbusreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index 4d675eb9461d..fe591ca9e5a9 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/macio/onyx.c b/sys/dev/sound/macio/onyx.c
index c258723c8419..07cc79b4581f 100644
--- a/sys/dev/sound/macio/onyx.c
+++ b/sys/dev/sound/macio/onyx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 by Andreas Tobler. All rights reserved.
*
diff --git a/sys/dev/sound/macio/snapper.c b/sys/dev/sound/macio/snapper.c
index fe30357c99fc..f222572911f7 100644
--- a/sys/dev/sound/macio/snapper.c
+++ b/sys/dev/sound/macio/snapper.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/macio/tumbler.c b/sys/dev/sound/macio/tumbler.c
index 180482e47215..1c0fa9ddd518 100644
--- a/sys/dev/sound/macio/tumbler.c
+++ b/sys/dev/sound/macio/tumbler.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-3-Clause
*
* Copyright 2008 by Marco Trillo. All rights reserved.
*
diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h
index eb72d1c18359..d371ec8662ff 100644
--- a/sys/dev/sound/midi/midi.h
+++ b/sys/dev/sound/midi/midi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h
index ea19c06bae63..1ff52c39a146 100644
--- a/sys/dev/sound/midi/midiq.h
+++ b/sys/dev/sound/midi/midiq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index d47c128949a5..f5b6ea08b356 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
diff --git a/sys/dev/sound/midi/mpu401.h b/sys/dev/sound/midi/mpu401.h
index fd244447dadb..07604adf6e6e 100644
--- a/sys/dev/sound/midi/mpu401.h
+++ b/sys/dev/sound/midi/mpu401.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mathew Kanner
* All rights reserved.
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index a351cca89999..134e95f013a5 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mathew Kanner
* Copyright (c) 1993 Hannu Savolainen
diff --git a/sys/dev/sound/midi/sequencer.h b/sys/dev/sound/midi/sequencer.h
index 29405ea3c5f8..36bd8d324798 100644
--- a/sys/dev/sound/midi/sequencer.h
+++ b/sys/dev/sound/midi/sequencer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mathew Kanner
* Copyright (c) 1999 Seigo Tanimura
diff --git a/sys/dev/sound/pci/allegro_code.h b/sys/dev/sound/pci/allegro_code.h
index 4a46012cd242..29f2f603ab23 100644
--- a/sys/dev/sound/pci/allegro_code.h
+++ b/sys/dev/sound/pci/allegro_code.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996-2008, 4Front Technologies
* Copyright (C) 1997-1999 ESS Technology, Inc
diff --git a/sys/dev/sound/pci/allegro_reg.h b/sys/dev/sound/pci/allegro_reg.h
index e340432e881d..60b0c812e78d 100644
--- a/sys/dev/sound/pci/allegro_reg.h
+++ b/sys/dev/sound/pci/allegro_reg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996-2008, 4Front Technologies
* Copyright (C) 1992-2000 Don Kim (don.kim@esstech.com)
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index d12b262e825e..12a93115f859 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Orion Hodson <oho@acm.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index 64b609ec1e25..c6667929ca7b 100644
--- a/sys/dev/sound/pci/als4000.h
+++ b/sys/dev/sound/pci/als4000.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index 21e8350b691e..4675c4e5cb73 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/atiixp.h b/sys/dev/sound/pci/atiixp.h
index ccd99d6cb6c1..d1b76502995f 100644
--- a/sys/dev/sound/pci/atiixp.h
+++ b/sys/dev/sound/pci/atiixp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 30868de323b3..08ff0e282390 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index 6763f17f84f0..a8fc215f5355 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index bc0f00997ff8..b5a18aeb0e72 100644
--- a/sys/dev/sound/pci/cs4281.h
+++ b/sys/dev/sound/pci/cs4281.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
diff --git a/sys/dev/sound/pci/cs461x_dsp.h b/sys/dev/sound/pci/cs461x_dsp.h
index 23c4d0aa3ec3..defa18e29f4d 100644
--- a/sys/dev/sound/pci/cs461x_dsp.h
+++ b/sys/dev/sound/pci/cs461x_dsp.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996-2008, 4Front Technologies
* All rights reserved.
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 61f4d750df2d..84df765e9fcf 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
index a013f8d9f3e6..0b17df410b99 100644
--- a/sys/dev/sound/pci/csamidi.c
+++ b/sys/dev/sound/pci/csamidi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
* Copyright (c) 2015-2018 Tai-hwa Liang <avatar@FreeBSD.org>
* All rights reserved
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 41500e46e66d..2406dc240b9a 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/pci/csareg.h b/sys/dev/sound/pci/csareg.h
index 77a34a2d6bc7..989be48d1910 100644
--- a/sys/dev/sound/pci/csareg.h
+++ b/sys/dev/sound/pci/csareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/pci/csavar.h b/sys/dev/sound/pci/csavar.h
index a3d8079be8a7..6ccdb3a1beeb 100644
--- a/sys/dev/sound/pci/csavar.h
+++ b/sys/dev/sound/pci/csavar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index d9641b632051..271b0faccd6e 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 9ee71ed96847..d3a87a4ab394 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 David O'Brien <obrien@FreeBSD.org>
* Copyright (c) 2003 Orlando Bassotto <orlando.bassotto@ieo-research.it>
diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c
index a458b6993c08..37361e0f6e69 100644
--- a/sys/dev/sound/pci/emu10kx-midi.c
+++ b/sys/dev/sound/pci/emu10kx-midi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Seigo Tanimura
* Copyright (c) 2003 Mathew Kanner
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 5f66799ab902..b12c5a5019e9 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
* Copyright (c) 2003-2007 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index 85c200631ca2..e1276038ebf3 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright (c) 2003-2007 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
diff --git a/sys/dev/sound/pci/emu10kx.h b/sys/dev/sound/pci/emu10kx.h
index be36c664c36f..92dd7ba643b4 100644
--- a/sys/dev/sound/pci/emu10kx.h
+++ b/sys/dev/sound/pci/emu10kx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
* Copyright (c) 2003-2006 Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index a6cb28ab6040..89a413bfd6ba 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/envy24.h b/sys/dev/sound/pci/envy24.h
index 3da4eab7400b..a0c7a644d835 100644
--- a/sys/dev/sound/pci/envy24.h
+++ b/sys/dev/sound/pci/envy24.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index d794fe605967..5ecdc7be225d 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
diff --git a/sys/dev/sound/pci/envy24ht.h b/sys/dev/sound/pci/envy24ht.h
index de1b0a54025f..282135a29825 100644
--- a/sys/dev/sound/pci/envy24ht.h
+++ b/sys/dev/sound/pci/envy24ht.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 351b7f5ed287..9be691124b88 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause
*
* Copyright (c) 1999 Russell Cattelan <cattelan@thebarn.com>
* Copyright (c) 1998 Joachim Kuebart <joachim.kuebart@gmx.net>
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index e1e2fe4e933d..358fc1f78041 100644
--- a/sys/dev/sound/pci/es137x.h
+++ b/sys/dev/sound/pci/es137x.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Joachim Kuebart <joachim.kuebart@gmx.net>
* All rights reserved.
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 886d50f27fe7..7659640df7fd 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Dmitry Dicky diwil@dataart.com
* All rights reserved.
diff --git a/sys/dev/sound/pci/hda/hda_reg.h b/sys/dev/sound/pci/hda/hda_reg.h
index 59fe92dd6d7e..c1c0753e0da8 100644
--- a/sys/dev/sound/pci/hda/hda_reg.h
+++ b/sys/dev/sound/pci/hda/hda_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index e0cfca10e014..85cf1fe46b8a 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdaa.h b/sys/dev/sound/pci/hda/hdaa.h
index 15a3db5edd04..dee9d4b23e91 100644
--- a/sys/dev/sound/pci/hda/hdaa.h
+++ b/sys/dev/sound/pci/hda/hdaa.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c
index a8e45139494e..567e11a8cf8a 100644
--- a/sys/dev/sound/pci/hda/hdaa_patches.c
+++ b/sys/dev/sound/pci/hda/hdaa_patches.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index 9aa0e4bffdc8..f6c6a5ae2828 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 4a31d26c2b6a..748f14420b53 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hda/hdac_private.h b/sys/dev/sound/pci/hda/hdac_private.h
index 1406f94a8e4f..1643fe1921de 100644
--- a/sys/dev/sound/pci/hda/hdac_private.h
+++ b/sys/dev/sound/pci/hda/hdac_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2008-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/hdac_reg.h b/sys/dev/sound/pci/hda/hdac_reg.h
index 6ce9f76494ac..364ff9ed383b 100644
--- a/sys/dev/sound/pci/hda/hdac_reg.h
+++ b/sys/dev/sound/pci/hda/hdac_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c
index 046dfdc208e6..d37acc17524a 100644
--- a/sys/dev/sound/pci/hda/hdacc.c
+++ b/sys/dev/sound/pci/hda/hdacc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* Copyright (c) 2006 Ariff Abdullah <ariff@FreeBSD.org>
diff --git a/sys/dev/sound/pci/hda/pin_patch.h b/sys/dev/sound/pci/hda/pin_patch.h
index ecf23bdb9603..73eb6a416729 100644
--- a/sys/dev/sound/pci/hda/pin_patch.h
+++ b/sys/dev/sound/pci/hda/pin_patch.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Khamba Staring <k.staring@quickdecay.com>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hda/pin_patch_realtek.h b/sys/dev/sound/pci/hda/pin_patch_realtek.h
index 326b353531c4..51fbb124235b 100644
--- a/sys/dev/sound/pci/hda/pin_patch_realtek.h
+++ b/sys/dev/sound/pci/hda/pin_patch_realtek.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Khamba Staring <k.staring@quickdecay.com>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index 20cb39d2de14..c6bef21f123f 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
index 700b85f776dd..ccbd0aa18882 100644
--- a/sys/dev/sound/pci/hdspe.c
+++ b/sys/dev/sound/pci/hdspe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h
index 2fbff2adcc65..9908be599767 100644
--- a/sys/dev/sound/pci/hdspe.h
+++ b/sys/dev/sound/pci/hdspe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 2ee8c00cd6e4..08c8dbb1d292 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index e3d81890b21c..003a5eca7e30 100644
--- a/sys/dev/sound/pci/ich.h
+++ b/sys/dev/sound/pci/ich.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 0d55e1227b9a..f99fcc79074f 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2004 Taku YAMAMOTO <taku@tackymt.homeip.net>
* All rights reserved.
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 77b85f20c327..aeb4bebc9185 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Scott Long <scottl@freebsd.org>
* Copyright (c) 2001 Darrell Anderson <anderson@cs.duke.edu>
diff --git a/sys/dev/sound/pci/maestro_reg.h b/sys/dev/sound/pci/maestro_reg.h
index 5ec691ca8e8b..83aa8ecd5577 100644
--- a/sys/dev/sound/pci/maestro_reg.h
+++ b/sys/dev/sound/pci/maestro_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index 0422e45c0066..9e1a3fcb8001 100644
--- a/sys/dev/sound/pci/neomagic-coeff.h
+++ b/sys/dev/sound/pci/neomagic-coeff.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 5e3805645cf2..dd0c6fdf49f7 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index 1403b535b552..88570cac9a24 100644
--- a/sys/dev/sound/pci/neomagic.h
+++ b/sys/dev/sound/pci/neomagic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 6d5b833264d6..d8fa17722fbd 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
*
diff --git a/sys/dev/sound/pci/spicds.c b/sys/dev/sound/pci/spicds.c
index 23a24461a069..4f6431fc6856 100644
--- a/sys/dev/sound/pci/spicds.c
+++ b/sys/dev/sound/pci/spicds.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
diff --git a/sys/dev/sound/pci/spicds.h b/sys/dev/sound/pci/spicds.h
index a8bbbb3919b8..2530ff0e90f4 100644
--- a/sys/dev/sound/pci/spicds.h
+++ b/sys/dev/sound/pci/spicds.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Konstantin Dimitrov <kosio.dimitrov@gmail.com>
* Copyright (c) 2001 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 08edb53b11a0..7380f1ccb861 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index cd832f4f51e5..05be64fc84aa 100644
--- a/sys/dev/sound/pci/t4dwave.h
+++ b/sys/dev/sound/pci/t4dwave.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index de8c4738666b..6d0224cad798 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Orion Hodson <orion@freebsd.org>
* Portions of this code derived from via82c686.c:
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index 774f946db6be..727f2224208a 100644
--- a/sys/dev/sound/pci/via8233.h
+++ b/sys/dev/sound/pci/via8233.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Orion Hodson <orion@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 04d97ba8aa8d..1f98a90229f2 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 David Jones <dej@ox.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index a46efb061a8f..7b9a32d3c154 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index 37230720be91..e41f37d1f60f 100644
--- a/sys/dev/sound/pci/vibes.h
+++ b/sys/dev/sound/pci/vibes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 960176329b3e..c155ab130b32 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 4789448d2822..a5046a1822e2 100644
--- a/sys/dev/sound/pcm/ac97.h
+++ b/sys/dev/sound/pcm/ac97.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c
index a88d54b82504..f1a358b50958 100644
--- a/sys/dev/sound/pcm/ac97_patch.c
+++ b/sys/dev/sound/pcm/ac97_patch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Orion Hodson
* All rights reserved.
diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h
index dbcc309a49cc..c5bf5ef2528a 100644
--- a/sys/dev/sound/pcm/ac97_patch.h
+++ b/sys/dev/sound/pcm/ac97_patch.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Orion Hodson
* All rights reserved.
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index b86b67e44344..1a4f49c53a62 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index 74a684b9a4ac..70f0c55635bd 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 065bf6ee2c5c..d1c715275e7c 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 60b7b3416cc3..efd0ba419cfb 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index cddc05206c4d..bb435bc3925c 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index d46334a1052c..c9768e5f1cfa 100644
--- a/sys/dev/sound/pcm/dsp.h
+++ b/sys/dev/sound/pcm/dsp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 1a53d1ba5ca1..d379d06b8664 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index dd73b050b7a1..165c19345c1f 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
index fe114b727ffd..9c3baaf282b5 100644
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c
index 233f8dd212fe..bc39d33c03fb 100644
--- a/sys/dev/sound/pcm/feeder_eq.c
+++ b/sys/dev/sound/pcm/feeder_eq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c
index 354c7e51df63..8a9054561b2b 100644
--- a/sys/dev/sound/pcm/feeder_format.c
+++ b/sys/dev/sound/pcm/feeder_format.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c
index 576136ce30b3..33bf3ec11ee0 100644
--- a/sys/dev/sound/pcm/feeder_matrix.c
+++ b/sys/dev/sound/pcm/feeder_matrix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c
index b2a173a65485..13afceabf28e 100644
--- a/sys/dev/sound/pcm/feeder_mixer.c
+++ b/sys/dev/sound/pcm/feeder_mixer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index f6bb1836089b..a2a3e4544763 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c
index 2312bd89c9d4..724d5a0922e8 100644
--- a/sys/dev/sound/pcm/feeder_volume.c
+++ b/sys/dev/sound/pcm/feeder_volume.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/g711.h b/sys/dev/sound/pcm/g711.h
index 08c4b0e0a578..c00b5630ff79 100644
--- a/sys/dev/sound/pcm/g711.h
+++ b/sys/dev/sound/pcm/g711.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/intpcm.h b/sys/dev/sound/pcm/intpcm.h
index aecdee7b5c8f..d8af6df3789a 100644
--- a/sys/dev/sound/pcm/intpcm.h
+++ b/sys/dev/sound/pcm/intpcm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h
index 5a489a37c635..ff7812f5d977 100644
--- a/sys/dev/sound/pcm/matrix.h
+++ b/sys/dev/sound/pcm/matrix.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/matrix_map.h b/sys/dev/sound/pcm/matrix_map.h
index 0d239c555449..268c1c51c6d4 100644
--- a/sys/dev/sound/pcm/matrix_map.h
+++ b/sys/dev/sound/pcm/matrix_map.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index bbc57f737036..080daeced12d 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 7857609b2895..cc3c7a7aeb42 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h
index 15119fe16d95..855f897368d1 100644
--- a/sys/dev/sound/pcm/pcm.h
+++ b/sys/dev/sound/pcm/pcm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index 7eb21c6840e7..53c8ae022cbb 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2001 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/sndstat.h b/sys/dev/sound/pcm/sndstat.h
index b0b59c3d7ea3..9abab72e73e9 100644
--- a/sys/dev/sound/pcm/sndstat.h
+++ b/sys/dev/sound/pcm/sndstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index a9d24703dbb0..bbf76869c32b 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 62787a3e689c..74094abe66ea 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index a2e25e352055..0b0ddc224094 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2001 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h
index 44e666249219..5b4eebbcb0e2 100644
--- a/sys/dev/sound/pcm/vchan.h
+++ b/sys/dev/sound/pcm/vchan.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
* Copyright (c) 2001 Cameron Grant <cg@FreeBSD.org>
diff --git a/sys/dev/sound/unit.c b/sys/dev/sound/unit.c
index c95d8db227fc..dded1b60452d 100644
--- a/sys/dev/sound/unit.c
+++ b/sys/dev/sound/unit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/unit.h b/sys/dev/sound/unit.h
index fb7a85612456..32f070e84f31 100644
--- a/sys/dev/sound/unit.h
+++ b/sys/dev/sound/unit.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index ece0a5b41849..792bbe017c9d 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
*
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index 9c4666c41bba..864081740c3a 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
* Copyright (c) 2006 Hans Petter Selasky
diff --git a/sys/dev/sound/version.h b/sys/dev/sound/version.h
index c36bc1a2d353..363da65580c1 100644
--- a/sys/dev/sound/version.h
+++ b/sys/dev/sound/version.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Ariff Abdullah <ariff@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/spibus/ofw_spibus.c b/sys/dev/spibus/ofw_spibus.c
index f24b12dccb90..c54cbdd4cb9b 100644
--- a/sys/dev/spibus/ofw_spibus.c
+++ b/sys/dev/spibus/ofw_spibus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* Copyright (c) 2013 The FreeBSD Foundation
diff --git a/sys/dev/sume/adapter.h b/sys/dev/sume/adapter.h
index 4f34ee05d8e1..6780f4a43439 100644
--- a/sys/dev/sume/adapter.h
+++ b/sys/dev/sume/adapter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Bjoern A. Zeeb
* Copyright (c) 2020 Denis Salopek
diff --git a/sys/dev/sume/if_sume.c b/sys/dev/sume/if_sume.c
index ba9a5098000d..689cb85e1234 100644
--- a/sys/dev/sume/if_sume.c
+++ b/sys/dev/sume/if_sume.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Bjoern A. Zeeb
* Copyright (c) 2020 Denis Salopek
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index 5fcc3d942118..571ba4d1d997 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Sandro Sigala, Brescia, Italy.
* Copyright (c) 1997 Chris Shenton
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index 636f6006a421..9f2ad130812b 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brad Forschinger
* All rights reserved.
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 7c6adb2c3b49..d1a72019e28b 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index b520d62e6f73..745b463dbc5c 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c
index ed287a74b8f9..84203daeee24 100644
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index 1a66f3fa763f..a10d1cb38a06 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 9827476629fc..3f9bd6449308 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 990c12f8f89d..bfde70fb64d2 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 7c2b395d975b..daac4749e376 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 28ea4b41666c..41d67fe79ca8 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 73167bdb34f8..d3ac8112126c 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/tcp_log/tcp_log_dev.c b/sys/dev/tcp_log/tcp_log_dev.c
index ed292607f56d..7d2b5e4f0f5d 100644
--- a/sys/dev/tcp_log/tcp_log_dev.c
+++ b/sys/dev/tcp_log/tcp_log_dev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2017 Netflix, Inc.
*
diff --git a/sys/dev/tcp_log/tcp_log_dev.h b/sys/dev/tcp_log/tcp_log_dev.h
index 808271f8640b..220c8e958073 100644
--- a/sys/dev/tcp_log/tcp_log_dev.h
+++ b/sys/dev/tcp_log/tcp_log_dev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Netflix, Inc.
*
diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c
index 922ff5478a42..106fa385af57 100644
--- a/sys/dev/tdfx/tdfx_linux.c
+++ b/sys/dev/tdfx/tdfx_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 The FreeBSD Project
* All rights reserved.
diff --git a/sys/dev/terasic/de4led/terasic_de4led.c b/sys/dev/terasic/de4led/terasic_de4led.c
index ee99bd541233..08d306ec2367 100644
--- a/sys/dev/terasic/de4led/terasic_de4led.c
+++ b/sys/dev/terasic/de4led/terasic_de4led.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/de4led/terasic_de4led.h b/sys/dev/terasic/de4led/terasic_de4led.h
index 873a531ff3e1..8d0f69481620 100644
--- a/sys/dev/terasic/de4led/terasic_de4led.h
+++ b/sys/dev/terasic/de4led/terasic_de4led.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/de4led/terasic_de4led_fdt.c b/sys/dev/terasic/de4led/terasic_de4led_fdt.c
index d8473f7d0fbf..09a889f054e1 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_fdt.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/de4led/terasic_de4led_nexus.c b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
index 33ea2377cc03..c025b26988b4 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_nexus.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl.c b/sys/dev/terasic/mtl/terasic_mtl.c
index 10e3b413ca96..757390af7246 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.c
+++ b/sys/dev/terasic/mtl/terasic_mtl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl.h b/sys/dev/terasic/mtl/terasic_mtl.h
index 2ab6de00b7a0..aebf1c04619e 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.h
+++ b/sys/dev/terasic/mtl/terasic_mtl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl_fdt.c b/sys/dev/terasic/mtl/terasic_mtl_fdt.c
index d6b198ee0b9c..92c143d2faf5 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_fdt.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl_nexus.c b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
index dd136be4870a..fc27310c6ff1 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_nexus.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl_pixel.c b/sys/dev/terasic/mtl/terasic_mtl_pixel.c
index a4e4735f6da0..7dc6f04263e4 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_pixel.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_pixel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl_reg.c b/sys/dev/terasic/mtl/terasic_mtl_reg.c
index 29bdb5487493..c64ef1e51dde 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_reg.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_reg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl_syscons.c b/sys/dev/terasic/mtl/terasic_mtl_syscons.c
index 89c62f1d710c..5cb9ff4dc6e8 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_syscons.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_syscons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/terasic/mtl/terasic_mtl_text.c b/sys/dev/terasic/mtl/terasic_mtl_text.c
index 334cc0a5291e..d2445235ef1b 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_text.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_text.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c
index 5012b7a0e2d4..cff7f8342c7d 100644
--- a/sys/dev/tsec/if_tsec.c
+++ b/sys/dev/tsec/if_tsec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2007-2008 Semihalf, Rafal Jaworowski
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
diff --git a/sys/dev/tsec/if_tsec.h b/sys/dev/tsec/if_tsec.h
index 19ad346c85f6..307966752530 100644
--- a/sys/dev/tsec/if_tsec.h
+++ b/sys/dev/tsec/if_tsec.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
* All rights reserved.
diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c
index cfad15b533cf..5d405a9fa2a3 100644
--- a/sys/dev/tsec/if_tsec_fdt.c
+++ b/sys/dev/tsec/if_tsec_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2007-2008 Semihalf, Rafal Jaworowski
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
diff --git a/sys/dev/tsec/if_tsecreg.h b/sys/dev/tsec/if_tsecreg.h
index 18a81df71432..0dd5753ad57e 100644
--- a/sys/dev/tsec/if_tsecreg.h
+++ b/sys/dev/tsec/if_tsecreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008-2009 Semihalf, Piotr Ziecik
* Copyright (C) 2006-2007 Semihalf, Piotr Kruszynski
diff --git a/sys/dev/twa/tw_cl.h b/sys/dev/twa/tw_cl.h
index 8f047329c318..badcab84dcff 100644
--- a/sys/dev/twa/tw_cl.h
+++ b/sys/dev/twa/tw_cl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_externs.h b/sys/dev/twa/tw_cl_externs.h
index 30ad4a297e06..ea5be184a21e 100644
--- a/sys/dev/twa/tw_cl_externs.h
+++ b/sys/dev/twa/tw_cl_externs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_fwif.h b/sys/dev/twa/tw_cl_fwif.h
index cade2249d820..34cbf5574ee5 100644
--- a/sys/dev/twa/tw_cl_fwif.h
+++ b/sys/dev/twa/tw_cl_fwif.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_init.c b/sys/dev/twa/tw_cl_init.c
index ce213ed531ef..57b2fa09329c 100644
--- a/sys/dev/twa/tw_cl_init.c
+++ b/sys/dev/twa/tw_cl_init.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_intr.c b/sys/dev/twa/tw_cl_intr.c
index 85f96da3046d..4e7a98b0519f 100644
--- a/sys/dev/twa/tw_cl_intr.c
+++ b/sys/dev/twa/tw_cl_intr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_io.c b/sys/dev/twa/tw_cl_io.c
index a2a84f4daf69..b9ae947525e5 100644
--- a/sys/dev/twa/tw_cl_io.c
+++ b/sys/dev/twa/tw_cl_io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_ioctl.h b/sys/dev/twa/tw_cl_ioctl.h
index ca1bc10b0c3d..868a4744a3b6 100644
--- a/sys/dev/twa/tw_cl_ioctl.h
+++ b/sys/dev/twa/tw_cl_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_misc.c b/sys/dev/twa/tw_cl_misc.c
index fd2fb040eaac..23d4957645d8 100644
--- a/sys/dev/twa/tw_cl_misc.c
+++ b/sys/dev/twa/tw_cl_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_cl_share.h b/sys/dev/twa/tw_cl_share.h
index b699f70c0b7b..52b4110e79ad 100644
--- a/sys/dev/twa/tw_cl_share.h
+++ b/sys/dev/twa/tw_cl_share.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap
diff --git a/sys/dev/twa/tw_osl.h b/sys/dev/twa/tw_osl.h
index d6b4682bd55f..8b032a64e65d 100644
--- a/sys/dev/twa/tw_osl.h
+++ b/sys/dev/twa/tw_osl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c
index 6e30c930f293..b927230ac346 100644
--- a/sys/dev/twa/tw_osl_cam.c
+++ b/sys/dev/twa/tw_osl_cam.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_externs.h b/sys/dev/twa/tw_osl_externs.h
index 31dc33002f7b..60d332ed2e7b 100644
--- a/sys/dev/twa/tw_osl_externs.h
+++ b/sys/dev/twa/tw_osl_externs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c
index ce79982bd95e..5c149239cd86 100644
--- a/sys/dev/twa/tw_osl_freebsd.c
+++ b/sys/dev/twa/tw_osl_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_includes.h b/sys/dev/twa/tw_osl_includes.h
index e6811f5df2a7..87f24389bf38 100644
--- a/sys/dev/twa/tw_osl_includes.h
+++ b/sys/dev/twa/tw_osl_includes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_inline.h b/sys/dev/twa/tw_osl_inline.h
index 4fbea07af508..0c02e18a1a62 100644
--- a/sys/dev/twa/tw_osl_inline.h
+++ b/sys/dev/twa/tw_osl_inline.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_ioctl.h b/sys/dev/twa/tw_osl_ioctl.h
index 6c1673c158a8..4c0be4e7bddd 100644
--- a/sys/dev/twa/tw_osl_ioctl.h
+++ b/sys/dev/twa/tw_osl_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_share.h b/sys/dev/twa/tw_osl_share.h
index 0e5ee02e300c..83e43cced2e0 100644
--- a/sys/dev/twa/tw_osl_share.h
+++ b/sys/dev/twa/tw_osl_share.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twa/tw_osl_types.h b/sys/dev/twa/tw_osl_types.h
index d208606e61da..86e6e070c953 100644
--- a/sys/dev/twa/tw_osl_types.h
+++ b/sys/dev/twa/tw_osl_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-07 Applied Micro Circuits Corporation.
* Copyright (c) 2004-05 Vinod Kashyap.
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 389c4c4ac4c4..0890ec65c294 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 51d021657012..191502799fa8 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index 75549f5f8f3d..426f3d1e0bec 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
diff --git a/sys/dev/twe/twe_tables.h b/sys/dev/twe/twe_tables.h
index 408dcebe717a..0c4c4c576983 100644
--- a/sys/dev/twe/twe_tables.h
+++ b/sys/dev/twe/twe_tables.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
diff --git a/sys/dev/twe/tweio.h b/sys/dev/twe/tweio.h
index e2fa72932501..0d90d53c55d6 100644
--- a/sys/dev/twe/tweio.h
+++ b/sys/dev/twe/tweio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index d07135f5a83e..f7e45f2c6049 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2003 Paul Saab
diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h
index bb7c28e874e5..f9af492989c9 100644
--- a/sys/dev/twe/twevar.h
+++ b/sys/dev/twe/twevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/dev/tws/tws_cam.c b/sys/dev/tws/tws_cam.c
index 4e274df45804..ba52d6d0bac6 100644
--- a/sys/dev/tws/tws_cam.c
+++ b/sys/dev/tws/tws_cam.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 LSI Corp.
* All rights reserved.
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index ed3b7017d746..c98a191ba733 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index 2c1918c580e9..56cab701d91d 100644
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 4e4c3541aad2..343c82e4eb67 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c
index 985d58c850f0..0455dfedfb98 100644
--- a/sys/dev/uart/uart_bus_fdt.c
+++ b/sys/dev/uart/uart_bus_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
*
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index cebf90adf13f..aaee2aebd5af 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 TAKAHASHI Yoshihiro All rights reserved.
* Copyright (c) 2008 Marcel Moolenaar All rights reserved.
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index cf7fbb99b3d5..3cc49ca3b0b3 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar All rights reserved.
* Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index a1dcdea11dd0..9f33b0d4b657 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar. All rights reserved.
* Copyright (c) 2002 JF Hay. All rights reserved.
diff --git a/sys/dev/uart/uart_bus_scc.c b/sys/dev/uart/uart_bus_scc.c
index 3b643524825e..b09cdb43ee94 100644
--- a/sys/dev/uart/uart_bus_scc.c
+++ b/sys/dev/uart/uart_bus_scc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index 338c091d8c3d..8f15acbd9c62 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_cpu.h b/sys/dev/uart/uart_cpu.h
index 4eb7327fc788..ba52a2ec61ba 100644
--- a/sys/dev/uart/uart_cpu.h
+++ b/sys/dev/uart/uart_cpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c
index 68f743c8e8d2..c8cfe83c5530 100644
--- a/sys/dev/uart/uart_cpu_acpi.c
+++ b/sys/dev/uart/uart_cpu_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 The FreeBSD Foundation
* Copyright (c) 2019 Colin Percival
diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c
index c3b7b13d2bf7..b93b071b3f5b 100644
--- a/sys/dev/uart/uart_cpu_fdt.c
+++ b/sys/dev/uart/uart_cpu_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 The FreeBSD Foundation
*
diff --git a/sys/dev/uart/uart_cpu_powerpc.c b/sys/dev/uart/uart_cpu_powerpc.c
index b56efe4a235f..3c59d5e1882b 100644
--- a/sys/dev/uart/uart_cpu_powerpc.c
+++ b/sys/dev/uart/uart_cpu_powerpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_cpu_x86.c b/sys/dev/uart/uart_cpu_x86.c
index b9e109646c5d..161708e85694 100644
--- a/sys/dev/uart/uart_cpu_x86.c
+++ b/sys/dev/uart/uart_cpu_x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index ece433b4695c..fccb03b82a43 100644
--- a/sys/dev/uart/uart_dbg.c
+++ b/sys/dev/uart/uart_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c
index 813b30a539c0..25822bbbf00a 100644
--- a/sys/dev/uart/uart_dev_imx.c
+++ b/sys/dev/uart/uart_dev_imx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 3950941d92b9..209571eb6cce 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_dev_ns8250.h b/sys/dev/uart/uart_dev_ns8250.h
index 549815273dd2..64a3d4a4caf3 100644
--- a/sys/dev/uart/uart_dev_ns8250.h
+++ b/sys/dev/uart/uart_dev_ns8250.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c
index ae1536bc4300..f61439e93031 100644
--- a/sys/dev/uart/uart_dev_pl011.c
+++ b/sys/dev/uart/uart_dev_pl011.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Semihalf.
* All rights reserved.
diff --git a/sys/dev/uart/uart_dev_quicc.c b/sys/dev/uart/uart_dev_quicc.c
index 54b9c1ee628d..850a0f8657fd 100644
--- a/sys/dev/uart/uart_dev_quicc.c
+++ b/sys/dev/uart/uart_dev_quicc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Juniper Networks
* All rights reserved.
diff --git a/sys/dev/uart/uart_dev_ti8250.c b/sys/dev/uart/uart_dev_ti8250.c
index ebe777ed7fdb..ee41c12b59c9 100644
--- a/sys/dev/uart/uart_dev_ti8250.c
+++ b/sys/dev/uart/uart_dev_ti8250.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore
* All rights reserved.
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index e57ae525ffd9..af02bd3ee8fb 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index e6dec58d7705..41c83d40795b 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index 482a392cdb27..d258854e8abc 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index fdb212f3134e..ed81160e9091 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/atmegadci.h b/sys/dev/usb/controller/atmegadci.h
index 38e2e5322931..b81a6b2602ee 100644
--- a/sys/dev/usb/controller/atmegadci.h
+++ b/sys/dev/usb/controller/atmegadci.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/avr32dci.c b/sys/dev/usb/controller/avr32dci.c
index 67255f051855..e12f3925573f 100644
--- a/sys/dev/usb/controller/avr32dci.c
+++ b/sys/dev/usb/controller/avr32dci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/avr32dci.h b/sys/dev/usb/controller/avr32dci.h
index b46893b390f6..e623d2b548d7 100644
--- a/sys/dev/usb/controller/avr32dci.h
+++ b/sys/dev/usb/controller/avr32dci.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/dwc3.c b/sys/dev/usb/controller/dwc3.c
index 2f607e19248d..59cce7c64dda 100644
--- a/sys/dev/usb/controller/dwc3.c
+++ b/sys/dev/usb/controller/dwc3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.Org>
* Copyright (c) 2021-2022 Bjoern A. Zeeb <bz@FreeBSD.ORG>
diff --git a/sys/dev/usb/controller/dwc3.h b/sys/dev/usb/controller/dwc3.h
index 72420890d28c..17882699b2af 100644
--- a/sys/dev/usb/controller/dwc3.h
+++ b/sys/dev/usb/controller/dwc3.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Emmanuel Vadot <manu@FreeBSD.Org>
*
diff --git a/sys/dev/usb/controller/dwc_otg.c b/sys/dev/usb/controller/dwc_otg.c
index 8692964e23c3..9e142f6fefb3 100644
--- a/sys/dev/usb/controller/dwc_otg.c
+++ b/sys/dev/usb/controller/dwc_otg.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Daisuke Aoyama. All rights reserved.
* Copyright (c) 2012-2015 Hans Petter Selasky. All rights reserved.
diff --git a/sys/dev/usb/controller/dwc_otg.h b/sys/dev/usb/controller/dwc_otg.h
index 2de0214fb563..195765fb72cb 100644
--- a/sys/dev/usb/controller/dwc_otg.h
+++ b/sys/dev/usb/controller/dwc_otg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/dwc_otg_acpi.c b/sys/dev/usb/controller/dwc_otg_acpi.c
index c6154eabc15a..4ab74b830921 100644
--- a/sys/dev/usb/controller/dwc_otg_acpi.c
+++ b/sys/dev/usb/controller/dwc_otg_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Hans Petter Selasky.
*
diff --git a/sys/dev/usb/controller/dwc_otg_fdt.c b/sys/dev/usb/controller/dwc_otg_fdt.c
index de47a543680b..4a68d3fae01d 100644
--- a/sys/dev/usb/controller/dwc_otg_fdt.c
+++ b/sys/dev/usb/controller/dwc_otg_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Hans Petter Selasky.
*
diff --git a/sys/dev/usb/controller/dwc_otgreg.h b/sys/dev/usb/controller/dwc_otgreg.h
index 3c50ca58a6dc..8b4d0df866c1 100644
--- a/sys/dev/usb/controller/dwc_otgreg.h
+++ b/sys/dev/usb/controller/dwc_otgreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010,2011 Aleksandr Rybalko. All rights reserved.
*
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c
index dd4f7c568625..bd8cfdeff95c 100644
--- a/sys/dev/usb/controller/ehci.c
+++ b/sys/dev/usb/controller/ehci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2004 The NetBSD Foundation, Inc. All rights reserved.
diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c
index 01f758837d75..1ff9a72f69fa 100644
--- a/sys/dev/usb/controller/ehci_fsl.c
+++ b/sys/dev/usb/controller/ehci_fsl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2012 Semihalf
* All rights reserved.
diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c
index f5c63ae1c7b5..4c3a54a5ce30 100644
--- a/sys/dev/usb/controller/ehci_imx.c
+++ b/sys/dev/usb/controller/ehci_imx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2012 The FreeBSD Foundation
diff --git a/sys/dev/usb/controller/ehci_msm.c b/sys/dev/usb/controller/ehci_msm.c
index 1920f9c3854b..16b7555889ec 100644
--- a/sys/dev/usb/controller/ehci_msm.c
+++ b/sys/dev/usb/controller/ehci_msm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/dev/usb/controller/generic_xhci.c b/sys/dev/usb/controller/generic_xhci.c
index 727f72fefd9e..733b60748b29 100644
--- a/sys/dev/usb/controller/generic_xhci.c
+++ b/sys/dev/usb/controller/generic_xhci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Semihalf.
* Copyright (c) 2015 Stormshield.
diff --git a/sys/dev/usb/controller/generic_xhci.h b/sys/dev/usb/controller/generic_xhci.h
index 1c086d4a5304..40b6c35d0861 100644
--- a/sys/dev/usb/controller/generic_xhci.h
+++ b/sys/dev/usb/controller/generic_xhci.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Semihalf.
* Copyright (c) 2015 Stormshield.
diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c b/sys/dev/usb/controller/generic_xhci_acpi.c
index 09add23de5af..f31b822a5179 100644
--- a/sys/dev/usb/controller/generic_xhci_acpi.c
+++ b/sys/dev/usb/controller/generic_xhci_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Greg V <greg@unrelenting.technology>
*
diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c b/sys/dev/usb/controller/generic_xhci_fdt.c
index ea34c2077e43..ad1a75720995 100644
--- a/sys/dev/usb/controller/generic_xhci_fdt.c
+++ b/sys/dev/usb/controller/generic_xhci_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Semihalf.
* Copyright (c) 2015 Stormshield.
diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c
index 292f45f005ce..00dd8b6ac6e5 100644
--- a/sys/dev/usb/controller/musb_otg.c
+++ b/sys/dev/usb/controller/musb_otg.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/musb_otg.h b/sys/dev/usb/controller/musb_otg.h
index 5d445a3dc8d1..dbd91b587d6f 100644
--- a/sys/dev/usb/controller/musb_otg.h
+++ b/sys/dev/usb/controller/musb_otg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c
index 7268af06a602..102fbbe97a84 100644
--- a/sys/dev/usb/controller/ohci.c
+++ b/sys/dev/usb/controller/ohci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * 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/controller/ohcireg.h b/sys/dev/usb/controller/ohcireg.h
index c6ea41135cc4..5f74a0bdbcca 100644
--- a/sys/dev/usb/controller/ohcireg.h
+++ b/sys/dev/usb/controller/ohcireg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index 28ae5cd37879..a374bcde21bf 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * 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/controller/uhci.h b/sys/dev/usb/controller/uhci.h
index fd6a71e0338b..3d19ee223a06 100644
--- a/sys/dev/usb/controller/uhci.h
+++ b/sys/dev/usb/controller/uhci.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c
index 7cfd2c18d0d6..2a5e9c515ada 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/controller/uhcireg.h b/sys/dev/usb/controller/uhcireg.h
index fa0e4eb9ce87..a65087cfd81b 100644
--- a/sys/dev/usb/controller/uhcireg.h
+++ b/sys/dev/usb/controller/uhcireg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index 37f318ca98df..fd18d93e344c 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/controller/usb_nop_xceiv.c b/sys/dev/usb/controller/usb_nop_xceiv.c
index b2dece4c1e3d..dd032dcbb43d 100644
--- a/sys/dev/usb/controller/usb_nop_xceiv.c
+++ b/sys/dev/usb/controller/usb_nop_xceiv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c
index 965437fa1dc5..3ccbf7618797 100644
--- a/sys/dev/usb/controller/uss820dci.c
+++ b/sys/dev/usb/controller/uss820dci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/usb/controller/uss820dci.h b/sys/dev/usb/controller/uss820dci.h
index 13001b1d3924..d3ccfcda4591 100644
--- a/sys/dev/usb/controller/uss820dci.h
+++ b/sys/dev/usb/controller/uss820dci.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index e28529ca003d..f388eeb87ce1 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2022 Hans Petter Selasky
*
diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h
index 4701e62ba3e5..a2f4e571916a 100644
--- a/sys/dev/usb/controller/xhci.h
+++ b/sys/dev/usb/controller/xhci.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2022 Hans Petter Selasky
*
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c
index 2a98bc45b700..e6c9c49e6e66 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2022 Hans Petter Selasky
*
diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h
index 38acffaca050..8fd321b5508a 100644
--- a/sys/dev/usb/controller/xhcireg.h
+++ b/sys/dev/usb/controller/xhcireg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_audio.c b/sys/dev/usb/gadget/g_audio.c
index 2ab6642cb123..4fb075ed1b9c 100644
--- a/sys/dev/usb/gadget/g_audio.c
+++ b/sys/dev/usb/gadget/g_audio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_audio.h b/sys/dev/usb/gadget/g_audio.h
index 111071cda0ad..d389385ae045 100644
--- a/sys/dev/usb/gadget/g_audio.h
+++ b/sys/dev/usb/gadget/g_audio.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_keyboard.c b/sys/dev/usb/gadget/g_keyboard.c
index d88e0ea432ce..52b042c5c6f0 100644
--- a/sys/dev/usb/gadget/g_keyboard.c
+++ b/sys/dev/usb/gadget/g_keyboard.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_keyboard.h b/sys/dev/usb/gadget/g_keyboard.h
index 3e24462c2fe5..7a05c6813b08 100644
--- a/sys/dev/usb/gadget/g_keyboard.h
+++ b/sys/dev/usb/gadget/g_keyboard.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_modem.c b/sys/dev/usb/gadget/g_modem.c
index 02593a9ce5fe..ba4608919176 100644
--- a/sys/dev/usb/gadget/g_modem.c
+++ b/sys/dev/usb/gadget/g_modem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_modem.h b/sys/dev/usb/gadget/g_modem.h
index c7add7a8ffc1..bd1e7878f78e 100644
--- a/sys/dev/usb/gadget/g_modem.h
+++ b/sys/dev/usb/gadget/g_modem.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_mouse.c b/sys/dev/usb/gadget/g_mouse.c
index ce78b5aaa737..85f8059292e1 100644
--- a/sys/dev/usb/gadget/g_mouse.c
+++ b/sys/dev/usb/gadget/g_mouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/gadget/g_mouse.h b/sys/dev/usb/gadget/g_mouse.h
index 3d256b0a0de1..d2361ce276a8 100644
--- a/sys/dev/usb/gadget/g_mouse.h
+++ b/sys/dev/usb/gadget/g_mouse.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c
index d16e1aae5a23..0dac260a5bbe 100644
--- a/sys/dev/usb/input/atp.c
+++ b/sys/dev/usb/input/atp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Rohit Grover
* All rights reserved.
diff --git a/sys/dev/usb/input/uep.c b/sys/dev/usb/input/uep.c
index 5b96a31b1dee..a56f3ae56d46 100644
--- a/sys/dev/usb/input/uep.c
+++ b/sys/dev/usb/input/uep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010, Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/usb/input/uhid_snes.c b/sys/dev/usb/input/uhid_snes.c
index d786b0e1f257..3959769b1c16 100644
--- a/sys/dev/usb/input/uhid_snes.c
+++ b/sys/dev/usb/input/uhid_snes.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013, Michael Terrell <vashisnotatree@gmail.com>
* Copyright 2018, Johannes Lundberg <johalun0@gmail.com>
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index 5ddba1311762..632db034a806 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/input/usb_rdesc.h b/sys/dev/usb/input/usb_rdesc.h
index 5dbfdb91f3f2..a3bbf0ab7704 100644
--- a/sys/dev/usb/input/usb_rdesc.h
+++ b/sys/dev/usb/input/usb_rdesc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index c2da3df598c5..25627269c048 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Huang Wen Hui
* All rights reserved.
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index e777a8298cd9..305855620105 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Kevin Lo
* All rights reserved.
diff --git a/sys/dev/usb/net/if_axgereg.h b/sys/dev/usb/net/if_axgereg.h
index 542ea6d1ad8f..1ac77d7e67fb 100644
--- a/sys/dev/usb/net/if_axgereg.h
+++ b/sys/dev/usb/net/if_axgereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2014 Kevin Lo
* All rights reserved.
diff --git a/sys/dev/usb/net/if_cdceem.c b/sys/dev/usb/net/if_cdceem.c
index 92441d8173ee..210ee1d13da8 100644
--- a/sys/dev/usb/net/if_cdceem.c
+++ b/sys/dev/usb/net/if_cdceem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Ben Gray <bgray@freebsd.org>.
* Copyright (C) 2018 The FreeBSD Foundation.
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index f43c39154662..7b828c31f8c2 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2009 Diego Giagio. All rights reserved.
diff --git a/sys/dev/usb/net/if_iphethvar.h b/sys/dev/usb/net/if_iphethvar.h
index cebf264310d0..22c4865a7361 100644
--- a/sys/dev/usb/net/if_iphethvar.h
+++ b/sys/dev/usb/net/if_iphethvar.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2009 Diego Giagio. All rights reserved.
diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c
index 895e534d899d..f0ba99d25dce 100644
--- a/sys/dev/usb/net/if_muge.c
+++ b/sys/dev/usb/net/if_muge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Ben Gray <bgray@freebsd.org>.
* Copyright (C) 2018 The FreeBSD Foundation.
diff --git a/sys/dev/usb/net/if_mugereg.h b/sys/dev/usb/net/if_mugereg.h
index c50a4c9c08be..878de003b5ed 100644
--- a/sys/dev/usb/net/if_mugereg.h
+++ b/sys/dev/usb/net/if_mugereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation.
*
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 58135332dacf..80e2330ea938 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
diff --git a/sys/dev/usb/net/if_ruereg.h b/sys/dev/usb/net/if_ruereg.h
index 688ee24e51eb..a1299c7e2d22 100644
--- a/sys/dev/usb/net/if_ruereg.h
+++ b/sys/dev/usb/net/if_ruereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index b95b8b274a6e..331fd92cea12 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
diff --git a/sys/dev/usb/net/if_smscreg.h b/sys/dev/usb/net/if_smscreg.h
index 5ad79b9e13ea..ac81e2b85ba3 100644
--- a/sys/dev/usb/net/if_smscreg.h
+++ b/sys/dev/usb/net/if_smscreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012
* Ben Gray <bgray@freebsd.org>.
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index 8c64ad71be4d..af127fc593c7 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Anybots Inc
* written by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
diff --git a/sys/dev/usb/net/if_usievar.h b/sys/dev/usb/net/if_usievar.h
index 8dc0506affbc..28b89a1db83d 100644
--- a/sys/dev/usb/net/if_usievar.h
+++ b/sys/dev/usb/net/if_usievar.h
@@ -2,7 +2,7 @@
/*-
* Copyright (c) 2011 Anybots Inc
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* written by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
* - ucom part is based on u3g.c
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index 017d07c3c134..f3af1808dfb6 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/net/ruephyreg.h b/sys/dev/usb/net/ruephyreg.h
index 38c508d5f01c..abcaf5dadae7 100644
--- a/sys/dev/usb/net/ruephyreg.h
+++ b/sys/dev/usb/net/ruephyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index 4ff5fcc075d3..7e6a6a46cea1 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Fredrik Lindberg <fli@shapeshifter.se>
* All rights reserved.
diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
index fe9fe12c9221..8d5a5d7e64e3 100644
--- a/sys/dev/usb/net/usb_ethernet.c
+++ b/sys/dev/usb/net/usb_ethernet.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Andrew Thompson (thompsa@FreeBSD.org)
*
diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h
index a0b1db4e1c02..bc6466fb9029 100644
--- a/sys/dev/usb/net/usb_ethernet.h
+++ b/sys/dev/usb/net/usb_ethernet.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h
index 399c8d3f65b4..ea2eac81b737 100644
--- a/sys/dev/usb/quirk/usb_quirk.h
+++ b/sys/dev/usb/quirk/usb_quirk.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c
index 10b37984db2f..2f3c10913d76 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c
index 2a35756b0a7e..ed7e6328052a 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c
index 4497be8c7fb4..8516f6e4f8b7 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2007, Takanori Watanabe
* All rights reserved.
diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c
index 06ef6480f27c..2a4a6f2f99b5 100644
--- a/sys/dev/usb/serial/ucycom.c
+++ b/sys/dev/usb/serial/ucycom.c
@@ -2,7 +2,7 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
* All rights reserved.
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index bc3f00a7b473..bee5e89f0f7d 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2005, Takanori Watanabe All rights reserved.
* Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index 06480509c576..6e6923cc948a 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Lev Serebryakov <lev@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h
index fe6fb45b90ea..df3b8b6b1c2f 100644
--- a/sys/dev/usb/serial/umcs.h
+++ b/sys/dev/usb/serial/umcs.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Lev Serebryakov <lev@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c
index dd452d38a67b..1531c8fbc741 100644
--- a/sys/dev/usb/serial/umct.c
+++ b/sys/dev/usb/serial/umct.c
@@ -2,7 +2,7 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Scott Long
* All rights reserved.
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index ec7e3f21662d..ca75cafe64ef 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c
index 9efac9ff6b7c..f66ec783dc6b 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c
index 8117043ed8dc..2329dcb4ca12 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2001-2003, 2005, 2008
* Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h
index cd60bcfb97a2..7c1aa37cd0cc 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-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c
index 8bb69e4402cf..1ea1a649ddc4 100644
--- a/sys/dev/usb/serial/uvscom.c
+++ b/sys/dev/usb/serial/uvscom.c
@@ -4,7 +4,7 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
diff --git a/sys/dev/usb/storage/cfumass.c b/sys/dev/usb/storage/cfumass.c
index 88b5a6156704..22e43e1afa6d 100644
--- a/sys/dev/usb/storage/cfumass.c
+++ b/sys/dev/usb/storage/cfumass.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 The FreeBSD Foundation
*
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index b8b502494264..1085ce0fe2a3 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -2,7 +2,7 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
* Nick Hibma <n_hibma@FreeBSD.org>
diff --git a/sys/dev/usb/storage/urio.c b/sys/dev/usb/storage/urio.c
index 25f1145f54e4..627331785479 100644
--- a/sys/dev/usb/storage/urio.c
+++ b/sys/dev/usb/storage/urio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Iwasa Kazmi
* All rights reserved.
diff --git a/sys/dev/usb/template/usb_template.c b/sys/dev/usb/template/usb_template.c
index 3b629b13b32d..617f70096cde 100644
--- a/sys/dev/usb/template/usb_template.c
+++ b/sys/dev/usb/template/usb_template.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/template/usb_template.h b/sys/dev/usb/template/usb_template.h
index 1bb2424ceef8..8ca4ad15bfe4 100644
--- a/sys/dev/usb/template/usb_template.h
+++ b/sys/dev/usb/template/usb_template.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/usb/template/usb_template_audio.c b/sys/dev/usb/template/usb_template_audio.c
index ec14d130b964..e0c3c9a52fa1 100644
--- a/sys/dev/usb/template/usb_template_audio.c
+++ b/sys/dev/usb/template/usb_template_audio.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_cdce.c b/sys/dev/usb/template/usb_template_cdce.c
index 4d713b07a112..9860ca6355e8 100644
--- a/sys/dev/usb/template/usb_template_cdce.c
+++ b/sys/dev/usb/template/usb_template_cdce.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_cdceem.c b/sys/dev/usb/template/usb_template_cdceem.c
index af5f444533f3..b610f552c51d 100644
--- a/sys/dev/usb/template/usb_template_cdceem.c
+++ b/sys/dev/usb/template/usb_template_cdceem.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_kbd.c b/sys/dev/usb/template/usb_template_kbd.c
index 7213796c4440..246936007a0a 100644
--- a/sys/dev/usb/template/usb_template_kbd.c
+++ b/sys/dev/usb/template/usb_template_kbd.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_midi.c b/sys/dev/usb/template/usb_template_midi.c
index 81471391d7a8..f70bdaf59612 100644
--- a/sys/dev/usb/template/usb_template_midi.c
+++ b/sys/dev/usb/template/usb_template_midi.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Hans Petter Selasky
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_modem.c b/sys/dev/usb/template/usb_template_modem.c
index 630f029c80a9..67c5ab161fb0 100644
--- a/sys/dev/usb/template/usb_template_modem.c
+++ b/sys/dev/usb/template/usb_template_modem.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_mouse.c b/sys/dev/usb/template/usb_template_mouse.c
index 05b688355d32..94f26c404547 100644
--- a/sys/dev/usb/template/usb_template_mouse.c
+++ b/sys/dev/usb/template/usb_template_mouse.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_msc.c b/sys/dev/usb/template/usb_template_msc.c
index f5b76b3bc592..2fb63deacc66 100644
--- a/sys/dev/usb/template/usb_template_msc.c
+++ b/sys/dev/usb/template/usb_template_msc.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_mtp.c b/sys/dev/usb/template/usb_template_mtp.c
index 5bde85927443..88f311396245 100644
--- a/sys/dev/usb/template/usb_template_mtp.c
+++ b/sys/dev/usb/template/usb_template_mtp.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky <hselasky@FreeBSD.org>
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_multi.c b/sys/dev/usb/template/usb_template_multi.c
index 6309f1355268..eeba095f7cc7 100644
--- a/sys/dev/usb/template/usb_template_multi.c
+++ b/sys/dev/usb/template/usb_template_multi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_phone.c b/sys/dev/usb/template/usb_template_phone.c
index c5ee3d9316f6..259feaee2a62 100644
--- a/sys/dev/usb/template/usb_template_phone.c
+++ b/sys/dev/usb/template/usb_template_phone.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Hans Petter Selasky
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/template/usb_template_serialnet.c b/sys/dev/usb/template/usb_template_serialnet.c
index 60bfffe31585..f6b1146253d5 100644
--- a/sys/dev/usb/template/usb_template_serialnet.c
+++ b/sys/dev/usb/template/usb_template_serialnet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
* Copyright (c) 2018 The FreeBSD Foundation
diff --git a/sys/dev/usb/ufm_ioctl.h b/sys/dev/usb/ufm_ioctl.h
index dbd0862440a1..b9e4f82afe80 100644
--- a/sys/dev/usb/ufm_ioctl.h
+++ b/sys/dev/usb/ufm_ioctl.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h
index 07784dedb839..05365f57ad1e 100644
--- a/sys/dev/usb/usb_bus.h
+++ b/sys/dev/usb/usb_bus.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2019 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c
index 69d9ea292523..26e3bd06310a 100644
--- a/sys/dev/usb/usb_busdma.c
+++ b/sys/dev/usb/usb_busdma.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_busdma.h b/sys/dev/usb/usb_busdma.h
index 254694e1b21f..737a566d220e 100644
--- a/sys/dev/usb/usb_busdma.h
+++ b/sys/dev/usb/usb_busdma.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h
index 81cb69016fd4..8f7b734cfad3 100644
--- a/sys/dev/usb/usb_controller.h
+++ b/sys/dev/usb/usb_controller.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_core.c b/sys/dev/usb/usb_core.c
index 9605839ec102..3a28c6554170 100644
--- a/sys/dev/usb/usb_core.c
+++ b/sys/dev/usb/usb_core.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_core.h b/sys/dev/usb/usb_core.h
index 390ea56789de..69dabe34c2ce 100644
--- a/sys/dev/usb/usb_core.h
+++ b/sys/dev/usb/usb_core.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c
index 6ad8dce9a037..8b8a16818b29 100644
--- a/sys/dev/usb/usb_debug.c
+++ b/sys/dev/usb/usb_debug.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2022 Hans Petter Selasky
*
diff --git a/sys/dev/usb/usb_debug.h b/sys/dev/usb/usb_debug.h
index 3f25268629cf..cbbc667de45e 100644
--- a/sys/dev/usb/usb_debug.h
+++ b/sys/dev/usb/usb_debug.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index 5f06b1b9690e..3bd07c31f499 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2023 Hans Petter Selasky
*
diff --git a/sys/dev/usb/usb_dev.h b/sys/dev/usb/usb_dev.h
index 8df3af9990cf..8e9ada99e0fc 100644
--- a/sys/dev/usb/usb_dev.h
+++ b/sys/dev/usb/usb_dev.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2023 Hans Petter Selasky
*
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 820cb21c704d..e6731f832c5e 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2023 Hans Petter Selasky
*
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index b925d98bafc2..b98ee90290a4 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2019 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_dynamic.c b/sys/dev/usb/usb_dynamic.c
index 1f4370ad2d53..e08822da9710 100644
--- a/sys/dev/usb/usb_dynamic.c
+++ b/sys/dev/usb/usb_dynamic.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_dynamic.h b/sys/dev/usb/usb_dynamic.h
index 2d46afc83560..a6f40265674f 100644
--- a/sys/dev/usb/usb_dynamic.h
+++ b/sys/dev/usb/usb_dynamic.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_endian.h b/sys/dev/usb/usb_endian.h
index 597617677282..650a3e721964 100644
--- a/sys/dev/usb/usb_endian.h
+++ b/sys/dev/usb/usb_endian.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_error.c b/sys/dev/usb/usb_error.c
index b2b44e18fa50..044994f1304f 100644
--- a/sys/dev/usb/usb_error.c
+++ b/sys/dev/usb/usb_error.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_freebsd.h b/sys/dev/usb/usb_freebsd.h
index 2d2123d4b622..dec0e12816ca 100644
--- a/sys/dev/usb/usb_freebsd.h
+++ b/sys/dev/usb/usb_freebsd.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_freebsd_loader.h b/sys/dev/usb/usb_freebsd_loader.h
index d3aade89640a..91041ce0f4e8 100644
--- a/sys/dev/usb/usb_freebsd_loader.h
+++ b/sys/dev/usb/usb_freebsd_loader.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c
index 640f9fdb7ad6..7331cdf02725 100644
--- a/sys/dev/usb/usb_generic.c
+++ b/sys/dev/usb/usb_generic.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2023 Hans Petter Selasky
*
diff --git a/sys/dev/usb/usb_generic.h b/sys/dev/usb/usb_generic.h
index fe59310634da..41d76914a69e 100644
--- a/sys/dev/usb/usb_generic.h
+++ b/sys/dev/usb/usb_generic.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c
index 69606d4f124a..f727dd189cdf 100644
--- a/sys/dev/usb/usb_handle_request.c
+++ b/sys/dev/usb/usb_handle_request.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_hub.h b/sys/dev/usb/usb_hub.h
index 3d4e08373107..d7ecc3fdbfa2 100644
--- a/sys/dev/usb/usb_hub.h
+++ b/sys/dev/usb/usb_hub.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index a57228a5fac2..01cbef6205a1 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * 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_lookup.c b/sys/dev/usb/usb_lookup.c
index 2d0e9b1b370a..14ae73a6b09d 100644
--- a/sys/dev/usb/usb_lookup.c
+++ b/sys/dev/usb/usb_lookup.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_mbuf.c b/sys/dev/usb/usb_mbuf.c
index 8da2f514cd65..5aed5324d287 100644
--- a/sys/dev/usb/usb_mbuf.c
+++ b/sys/dev/usb/usb_mbuf.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_mbuf.h b/sys/dev/usb/usb_mbuf.h
index 2466e2e4c4dc..d3e08d27f3b7 100644
--- a/sys/dev/usb/usb_mbuf.h
+++ b/sys/dev/usb/usb_mbuf.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c
index 338c17983d92..548622356774 100644
--- a/sys/dev/usb/usb_msctest.c
+++ b/sys/dev/usb/usb_msctest.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2022 Hans Petter Selasky.
* Copyright (c) 2021-2022 Idwer Vollering.
diff --git a/sys/dev/usb/usb_msctest.h b/sys/dev/usb/usb_msctest.h
index 08a7de1b5b9c..5cb083167710 100644
--- a/sys/dev/usb/usb_msctest.h
+++ b/sys/dev/usb/usb_msctest.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2022 Hans Petter Selasky.
*
diff --git a/sys/dev/usb/usb_parse.c b/sys/dev/usb/usb_parse.c
index 15bd1c967044..9a45ada63d9f 100644
--- a/sys/dev/usb/usb_parse.c
+++ b/sys/dev/usb/usb_parse.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2020 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_pci.h b/sys/dev/usb/usb_pci.h
index 86e8cb397e4d..758ff31c461f 100644
--- a/sys/dev/usb/usb_pci.h
+++ b/sys/dev/usb/usb_pci.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c
index 33dbad1bf998..62e2356baf0c 100644
--- a/sys/dev/usb/usb_process.c
+++ b/sys/dev/usb/usb_process.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h
index 8a416a308856..d0cad1778be3 100644
--- a/sys/dev/usb/usb_process.h
+++ b/sys/dev/usb/usb_process.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c
index c5b370ccd31a..79d70c6337f2 100644
--- a/sys/dev/usb/usb_request.c
+++ b/sys/dev/usb/usb_request.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * 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_request.h b/sys/dev/usb/usb_request.h
index 7c65313265ef..00d77a6c11f3 100644
--- a/sys/dev/usb/usb_request.h
+++ b/sys/dev/usb/usb_request.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c
index 20ed2c897aac..665563bb4791 100644
--- a/sys/dev/usb/usb_transfer.c
+++ b/sys/dev/usb/usb_transfer.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2021 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h
index 60841f473334..de439d2a649a 100644
--- a/sys/dev/usb/usb_transfer.h
+++ b/sys/dev/usb/usb_transfer.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c
index b333180b6551..e315e094b9f1 100644
--- a/sys/dev/usb/usb_util.c
+++ b/sys/dev/usb/usb_util.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2022 Hans Petter Selasky
*
diff --git a/sys/dev/usb/usb_util.h b/sys/dev/usb/usb_util.h
index 1bb20b86914b..fbc3ecad4beb 100644
--- a/sys/dev/usb/usb_util.h
+++ b/sys/dev/usb/usb_util.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 287e40d59364..dee16dcb8a0b 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Andrew Thompson
*
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index d0ee6f9d330a..b15819494c7d 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Andrew Thompson
*
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index 4ffdc9a72fad..b96fd789407f 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-1-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-1-Clause)
*
* Copyright (c) 2006 Sam Leffler, Errno Consulting
* Copyright (c) 2008-2009 Weongyo Jeong <weongyo@freebsd.org>
diff --git a/sys/dev/viawd/viawd.c b/sys/dev/viawd/viawd.c
index f62edd947d3b..f07143e098b5 100644
--- a/sys/dev/viawd/viawd.c
+++ b/sys/dev/viawd/viawd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/viawd/viawd.h b/sys/dev/viawd/viawd.h
index 4771a8663079..90aee0966358 100644
--- a/sys/dev/viawd/viawd.h
+++ b/sys/dev/viawd/viawd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/balloon/virtio_balloon.c b/sys/dev/virtio/balloon/virtio_balloon.c
index bf4e5cf916f7..34d1399ee961 100644
--- a/sys/dev/virtio/balloon/virtio_balloon.c
+++ b/sys/dev/virtio/balloon/virtio_balloon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c
index 83f55fb1dc1f..b137b7292d87 100644
--- a/sys/dev/virtio/block/virtio_blk.c
+++ b/sys/dev/virtio/block/virtio_blk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index 79011a2abfb8..2e96e16f1039 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h
index 3f36ff3c1ca4..3370994af7e3 100644
--- a/sys/dev/virtio/network/if_vtnetvar.h
+++ b/sys/dev/virtio/network/if_vtnetvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c
index 1a60196b5d02..e7e05cfe8550 100644
--- a/sys/dev/virtio/pci/virtio_pci.c
+++ b/sys/dev/virtio/pci/virtio_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/pci/virtio_pci.h b/sys/dev/virtio/pci/virtio_pci.h
index 4c9a0e1c4cbe..61b7a80d8d4e 100644
--- a/sys/dev/virtio/pci/virtio_pci.h
+++ b/sys/dev/virtio/pci/virtio_pci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/pci/virtio_pci_legacy.c b/sys/dev/virtio/pci/virtio_pci_legacy.c
index bc18c2562690..d818ca497e15 100644
--- a/sys/dev/virtio/pci/virtio_pci_legacy.c
+++ b/sys/dev/virtio/pci/virtio_pci_legacy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c
index 30dcebe320b1..9652fa794bd9 100644
--- a/sys/dev/virtio/pci/virtio_pci_modern.c
+++ b/sys/dev/virtio/pci/virtio_pci_modern.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c
index a95dcadcddcd..76beafc2b837 100644
--- a/sys/dev/virtio/random/virtio_random.c
+++ b/sys/dev/virtio/random/virtio_random.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/scsi/virtio_scsi.c b/sys/dev/virtio/scsi/virtio_scsi.c
index 51d9e5f532f7..4791c5eb4deb 100644
--- a/sys/dev/virtio/scsi/virtio_scsi.c
+++ b/sys/dev/virtio/scsi/virtio_scsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/scsi/virtio_scsi.h b/sys/dev/virtio/scsi/virtio_scsi.h
index c4435559f4e6..789bb198149d 100644
--- a/sys/dev/virtio/scsi/virtio_scsi.h
+++ b/sys/dev/virtio/scsi/virtio_scsi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers.
diff --git a/sys/dev/virtio/scsi/virtio_scsivar.h b/sys/dev/virtio/scsi/virtio_scsivar.h
index 064b1245a565..7524b8bb3143 100644
--- a/sys/dev/virtio/scsi/virtio_scsivar.h
+++ b/sys/dev/virtio/scsi/virtio_scsivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c
index 050e29c37dda..28591d75b9ff 100644
--- a/sys/dev/virtio/virtio.c
+++ b/sys/dev/virtio/virtio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c
index 14c2088b70a8..5db20b8492c4 100644
--- a/sys/dev/virtio/virtqueue.c
+++ b/sys/dev/virtio/virtqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/virtio/virtqueue.h b/sys/dev/virtio/virtqueue.h
index 4bde4e32edc6..fd3db98ac528 100644
--- a/sys/dev/virtio/virtqueue.h
+++ b/sys/dev/virtio/virtqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Bryan Venteicher <bryanv@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index 27cf4549f3db..4aba14d2fe99 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/dev/vkbd/vkbd_var.h b/sys/dev/vkbd/vkbd_var.h
index 73b7466498b2..c4457bbe8c55 100644
--- a/sys/dev/vkbd/vkbd_var.h
+++ b/sys/dev/vkbd/vkbd_var.h
@@ -1,7 +1,7 @@
/*-
* vkbd_var.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/dev/vmgenc/vmgenc_acpi.c b/sys/dev/vmgenc/vmgenc_acpi.c
index 812db6ea7df8..d2e78a9db5f2 100644
--- a/sys/dev/vmgenc/vmgenc_acpi.c
+++ b/sys/dev/vmgenc/vmgenc_acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/sys/dev/vmgenc/vmgenc_acpi.h b/sys/dev/vmgenc/vmgenc_acpi.h
index 8ad750baabe0..ae173c88e128 100644
--- a/sys/dev/vmgenc/vmgenc_acpi.h
+++ b/sys/dev/vmgenc/vmgenc_acpi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/sys/dev/vt/colors/vt_termcolors.c b/sys/dev/vt/colors/vt_termcolors.c
index dff276a86100..9cc15e11d457 100644
--- a/sys/dev/vt/colors/vt_termcolors.c
+++ b/sys/dev/vt/colors/vt_termcolors.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/colors/vt_termcolors.h b/sys/dev/vt/colors/vt_termcolors.h
index 3fc99ee9743f..a9f35ad05b2a 100644
--- a/sys/dev/vt/colors/vt_termcolors.h
+++ b/sys/dev/vt/colors/vt_termcolors.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/font/vt_font_default.c b/sys/dev/vt/font/vt_font_default.c
index b58ec2206cac..44b3f6557a5e 100644
--- a/sys/dev/vt/font/vt_font_default.c
+++ b/sys/dev/vt/font/vt_font_default.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2020 Dimitar Toshkov Zhekov.
*
diff --git a/sys/dev/vt/font/vt_mouse_cursor.c b/sys/dev/vt/font/vt_mouse_cursor.c
index 96bbd8b45b0a..87c4f2e24e45 100644
--- a/sys/dev/vt/font/vt_mouse_cursor.c
+++ b/sys/dev/vt/font/vt_mouse_cursor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c
index 20822629d0c5..ca9543910767 100644
--- a/sys/dev/vt/hw/efifb/efifb.c
+++ b/sys/dev/vt/hw/efifb/efifb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c
index 9d9635835202..7c4950a197f7 100644
--- a/sys/dev/vt/hw/fb/vt_early_fb.c
+++ b/sys/dev/vt/hw/fb/vt_early_fb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
index a84e182ef557..a00380639bb2 100644
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/hw/fb/vt_fb.h b/sys/dev/vt/hw/fb/vt_fb.h
index bd42bc176bab..ff0ac9803a8b 100644
--- a/sys/dev/vt/hw/fb/vt_fb.h
+++ b/sys/dev/vt/hw/fb/vt_fb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/hw/ofwfb/ofwfb.c b/sys/dev/vt/hw/ofwfb/ofwfb.c
index e388356450d6..473dcc638476 100644
--- a/sys/dev/vt/hw/ofwfb/ofwfb.c
+++ b/sys/dev/vt/hw/ofwfb/ofwfb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/dev/vt/hw/vbefb/vbefb.c b/sys/dev/vt/hw/vbefb/vbefb.c
index 2e8fe8330e56..08cae8c84077 100644
--- a/sys/dev/vt/hw/vbefb/vbefb.c
+++ b/sys/dev/vt/hw/vbefb/vbefb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/logo/logo_freebsd.c b/sys/dev/vt/logo/logo_freebsd.c
index 605d1a8591bd..458493880b99 100644
--- a/sys/dev/vt/logo/logo_freebsd.c
+++ b/sys/dev/vt/logo/logo_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
index 764d612ed060..649e5839fcbf 100644
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c
index 88e4fc472f9d..a13a7bd17cfe 100644
--- a/sys/dev/vt/vt_buf.c
+++ b/sys/dev/vt/vt_buf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/vt_consolectl.c b/sys/dev/vt/vt_consolectl.c
index 2751f0037e5d..34d42cbdfcfb 100644
--- a/sys/dev/vt/vt_consolectl.c
+++ b/sys/dev/vt/vt_consolectl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 72e3e8f24883..57dc0945fcb3 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2013 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/vt_font.c b/sys/dev/vt/vt_font.c
index c230342ecacb..221fdc92e02c 100644
--- a/sys/dev/vt/vt_font.c
+++ b/sys/dev/vt/vt_font.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/dev/vt/vt_sysmouse.c b/sys/dev/vt/vt_sysmouse.c
index c6426f3a8f17..14921ca863e2 100644
--- a/sys/dev/vt/vt_sysmouse.c
+++ b/sys/dev/vt/vt_sysmouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c
index b6bf909037e1..0dd2adcd3254 100644
--- a/sys/dev/vte/if_vte.c
+++ b/sys/dev/vte/if_vte.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/vte/if_vtereg.h b/sys/dev/vte/if_vtereg.h
index 2d90525010dc..f778c27ba486 100644
--- a/sys/dev/vte/if_vtereg.h
+++ b/sys/dev/vte/if_vtereg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/vte/if_vtevar.h b/sys/dev/vte/if_vtevar.h
index 9f2f7dda5bbf..416b809065e4 100644
--- a/sys/dev/vte/if_vtevar.h
+++ b/sys/dev/vte/if_vtevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c
index 430430f3e6ef..7a41b4f7a608 100644
--- a/sys/dev/watchdog/watchdog.c
+++ b/sys/dev/watchdog/watchdog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 2013 iXsystems.com,
diff --git a/sys/dev/wbwd/wbwd.c b/sys/dev/wbwd/wbwd.c
index 2c8cc63dbfdc..bbfb690d083c 100644
--- a/sys/dev/wbwd/wbwd.c
+++ b/sys/dev/wbwd/wbwd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Sandvine Incorporated ULC.
* Copyright (c) 2012 iXsystems, Inc.
diff --git a/sys/dev/wtap/if_medium.c b/sys/dev/wtap/if_medium.c
index f4b84d3784de..9362d914b171 100644
--- a/sys/dev/wtap/if_medium.c
+++ b/sys/dev/wtap/if_medium.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/if_medium.h b/sys/dev/wtap/if_medium.h
index 03d6e2ffefc0..5932f550fd16 100644
--- a/sys/dev/wtap/if_medium.h
+++ b/sys/dev/wtap/if_medium.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c
index d860fad601bd..7d53c9c47465 100644
--- a/sys/dev/wtap/if_wtap.c
+++ b/sys/dev/wtap/if_wtap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c
index 1f97d67d56ce..3cc844c45d4a 100644
--- a/sys/dev/wtap/if_wtap_module.c
+++ b/sys/dev/wtap/if_wtap_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/if_wtapioctl.h b/sys/dev/wtap/if_wtapioctl.h
index 14716e5c3f4a..c58818eb1ff9 100644
--- a/sys/dev/wtap/if_wtapioctl.h
+++ b/sys/dev/wtap/if_wtapioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/if_wtapvar.h b/sys/dev/wtap/if_wtapvar.h
index 966704cc481e..7ef751502a4f 100644
--- a/sys/dev/wtap/if_wtapvar.h
+++ b/sys/dev/wtap/if_wtapvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c
index d627e55d43f5..40c48726d63b 100644
--- a/sys/dev/wtap/plugins/visibility.c
+++ b/sys/dev/wtap/plugins/visibility.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/plugins/visibility.h b/sys/dev/wtap/plugins/visibility.h
index 7ae5864692f2..125f672a1745 100644
--- a/sys/dev/wtap/plugins/visibility.h
+++ b/sys/dev/wtap/plugins/visibility.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/plugins/visibility_ioctl.h b/sys/dev/wtap/plugins/visibility_ioctl.h
index 342a4ec45f51..5aa18ecad4b1 100644
--- a/sys/dev/wtap/plugins/visibility_ioctl.h
+++ b/sys/dev/wtap/plugins/visibility_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/plugins/wtap_plugin.h b/sys/dev/wtap/plugins/wtap_plugin.h
index 34d871aa6ab1..563f6ab877cc 100644
--- a/sys/dev/wtap/plugins/wtap_plugin.h
+++ b/sys/dev/wtap/plugins/wtap_plugin.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c
index 7c9205848665..e3ee96ccd432 100644
--- a/sys/dev/wtap/wtap_hal/hal.c
+++ b/sys/dev/wtap/wtap_hal/hal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/wtap_hal/hal.h b/sys/dev/wtap/wtap_hal/hal.h
index 8446bdbcdd1a..176c2647c936 100644
--- a/sys/dev/wtap/wtap_hal/hal.h
+++ b/sys/dev/wtap/wtap_hal/hal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/wtap/wtap_hal/handler.h b/sys/dev/wtap/wtap_hal/handler.h
index b25feb7a9879..31bd70821dbe 100644
--- a/sys/dev/wtap/wtap_hal/handler.h
+++ b/sys/dev/wtap/wtap_hal/handler.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
* All rights reserved.
diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index ca6670be0516..e77865413198 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2012 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index 82a9adaab494..8666fa37ba53 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause
*
* Copyright (c) 2010 Justin T. Gibbs, Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 06d92093d903..509981acaef6 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2011 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/dev/xen/netback/netback_unit_tests.c b/sys/dev/xen/netback/netback_unit_tests.c
index ace143e064ea..1a01b9860991 100644
--- a/sys/dev/xen/netback/netback_unit_tests.c
+++ b/sys/dev/xen/netback/netback_unit_tests.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2011 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index 4b8bd5589283..b8237b3a957d 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Kip Macy
* Copyright (c) 2015 Wei Liu <wei.liu2@citrix.com>
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
index ecd4e0990652..1a39a3259a4a 100644
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Adrian Chadd
* Copyright (c) 2012 Spectra Logic Corporation
diff --git a/sys/dev/xen/timer/timer.h b/sys/dev/xen/timer/timer.h
index d618cae2bbad..5595b7ea8443 100644
--- a/sys/dev/xen/timer/timer.h
+++ b/sys/dev/xen/timer/timer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index 07d424c1e7a7..22de56dbc42f 100644
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Citrix Systems, Inc.
* All rights reserved.
diff --git a/sys/dev/xen/xenpci/xenpcivar.h b/sys/dev/xen/xenpci/xenpcivar.h
index ece80f18f159..f3ba1be438bc 100644
--- a/sys/dev/xen/xenpci/xenpcivar.h
+++ b/sys/dev/xen/xenpci/xenpcivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Citrix Systems, Inc.
* All rights reserved.
diff --git a/sys/fs/autofs/autofs.h b/sys/fs/autofs/autofs.h
index 54400aab83f7..65cb826bdff8 100644
--- a/sys/fs/autofs/autofs.h
+++ b/sys/fs/autofs/autofs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/sys/fs/autofs/autofs_ioctl.h b/sys/fs/autofs/autofs_ioctl.h
index d80f81c9419d..f0931ca90a40 100644
--- a/sys/fs/autofs/autofs_ioctl.h
+++ b/sys/fs/autofs/autofs_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c
index 45b3943d5b70..07bec01517c8 100644
--- a/sys/fs/autofs/autofs_vfsops.c
+++ b/sys/fs/autofs/autofs_vfsops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/sys/fs/autofs/autofs_vnops.c b/sys/fs/autofs/autofs_vnops.c
index 13daa950d75b..877cf0ba9a7f 100644
--- a/sys/fs/autofs/autofs_vnops.c
+++ b/sys/fs/autofs/autofs_vnops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/sys/fs/cd9660/cd9660_iconv.c b/sys/fs/cd9660/cd9660_iconv.c
index 7b3213f30813..aabcc3bf079d 100644
--- a/sys/fs/cd9660/cd9660_iconv.c
+++ b/sys/fs/cd9660/cd9660_iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h
index aef291601289..846dfd108694 100644
--- a/sys/fs/devfs/devfs.h
+++ b/sys/fs/devfs/devfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 19619d94ba1c..6734621556ce 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2004
* Poul-Henning Kamp. All rights reserved.
diff --git a/sys/fs/devfs/devfs_dir.c b/sys/fs/devfs/devfs_dir.c
index d60f7a7c6372..a1a6903b6ec9 100644
--- a/sys/fs/devfs/devfs_dir.c
+++ b/sys/fs/devfs/devfs_dir.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Jaakko Heinonen <jh@FreeBSD.org>
* All rights reserved.
diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h
index 5c3cb17eca61..3c58e4629ddf 100644
--- a/sys/fs/devfs/devfs_int.h
+++ b/sys/fs/devfs/devfs_int.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp. All rights reserved.
*
diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index 9e94d6544673..73419b656af9 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 0fac2b68e2e1..82d52b3de996 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992, 1993, 1995
* The Regents of the University of California. All rights reserved.
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index a1a06eb6c3e6..030cf67bf7ad 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2004
* Poul-Henning Kamp. All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_acl.c b/sys/fs/ext2fs/ext2_acl.c
index 30d1c182a0b4..a0060c0fbe89 100644
--- a/sys/fs/ext2fs/ext2_acl.c
+++ b/sys/fs/ext2fs/ext2_acl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Fedor Uporov
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_acl.h b/sys/fs/ext2fs/ext2_acl.h
index 523edfa734f3..ead5fed5daa0 100644
--- a/sys/fs/ext2fs/ext2_acl.h
+++ b/sys/fs/ext2fs/ext2_acl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Fedor Uporov
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_csum.c b/sys/fs/ext2fs/ext2_csum.c
index 550c9172a992..46c677335af7 100644
--- a/sys/fs/ext2fs/ext2_csum.c
+++ b/sys/fs/ext2fs/ext2_csum.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Fedor Uporov
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_dinode.h b/sys/fs/ext2fs/ext2_dinode.h
index cfe34ddd964f..6df6ea6761e9 100644
--- a/sys/fs/ext2fs/ext2_dinode.h
+++ b/sys/fs/ext2fs/ext2_dinode.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Aditya Sarawgi
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_dir.h b/sys/fs/ext2fs/ext2_dir.h
index 52cfdfd78a00..8cc9e602608a 100644
--- a/sys/fs/ext2fs/ext2_dir.h
+++ b/sys/fs/ext2fs/ext2_dir.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Aditya Sarawgi
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_extattr.c b/sys/fs/ext2fs/ext2_extattr.c
index d08fa7ee778c..1fc244a91c36 100644
--- a/sys/fs/ext2fs/ext2_extattr.c
+++ b/sys/fs/ext2fs/ext2_extattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Fedor Uporov
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_extattr.h b/sys/fs/ext2fs/ext2_extattr.h
index 6bee73f94b02..6de8ab4de256 100644
--- a/sys/fs/ext2fs/ext2_extattr.h
+++ b/sys/fs/ext2fs/ext2_extattr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Fedor Uporov
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_extents.c b/sys/fs/ext2fs/ext2_extents.c
index b33ff9fa8a1a..bde4fcecf368 100644
--- a/sys/fs/ext2fs/ext2_extents.c
+++ b/sys/fs/ext2fs/ext2_extents.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Zheng Liu <lz@freebsd.org>
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_extents.h b/sys/fs/ext2fs/ext2_extents.h
index 52a96297b606..37013d4b4130 100644
--- a/sys/fs/ext2fs/ext2_extents.h
+++ b/sys/fs/ext2fs/ext2_extents.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2010 Zheng Liu <lz@freebsd.org>
* All rights reserved.
diff --git a/sys/fs/ext2fs/ext2_hash.c b/sys/fs/ext2fs/ext2_hash.c
index f9cfc286f381..9341cb091ac0 100644
--- a/sys/fs/ext2fs/ext2_hash.c
+++ b/sys/fs/ext2fs/ext2_hash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND RSA-MD)
+ * SPDX-License-Identifier: (BSD-2-Clause AND RSA-MD)
*
* Copyright (c) 2010, 2013 Zheng Liu <lz@freebsd.org>
* Copyright (c) 2012, Vyacheslav Matyushin
diff --git a/sys/fs/ext2fs/ext2_htree.c b/sys/fs/ext2fs/ext2_htree.c
index 84f3d26d252a..71b7bb48988d 100644
--- a/sys/fs/ext2fs/ext2_htree.c
+++ b/sys/fs/ext2fs/ext2_htree.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, 2012 Zheng Liu <lz@freebsd.org>
* Copyright (c) 2012, Vyacheslav Matyushin
diff --git a/sys/fs/ext2fs/ext2fs.h b/sys/fs/ext2fs/ext2fs.h
index f43ebcfebb92..f1f396d89a31 100644
--- a/sys/fs/ext2fs/ext2fs.h
+++ b/sys/fs/ext2fs/ext2fs.h
@@ -7,7 +7,7 @@
* $FreeBSD$
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Aditya Sarawgi
* All rights reserved.
diff --git a/sys/fs/ext2fs/htree.h b/sys/fs/ext2fs/htree.h
index e5220c09918f..cc391c5a8f40 100644
--- a/sys/fs/ext2fs/htree.h
+++ b/sys/fs/ext2fs/htree.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, 2012 Zheng Liu <lz@freebsd.org>
* Copyright (c) 2012, Vyacheslav Matyushin
diff --git a/sys/fs/mntfs/mntfs_vnops.c b/sys/fs/mntfs/mntfs_vnops.c
index 4eb12a679590..dc0f9f67f395 100644
--- a/sys/fs/mntfs/mntfs_vnops.c
+++ b/sys/fs/mntfs/mntfs_vnops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Netflix, Inc.
*
diff --git a/sys/fs/msdosfs/msdosfs_iconv.c b/sys/fs/msdosfs/msdosfs_iconv.c
index c6e2cef54645..e36c5c0ba301 100644
--- a/sys/fs/msdosfs/msdosfs_iconv.c
+++ b/sys/fs/msdosfs/msdosfs_iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c
index b733dc52803f..e47218106186 100644
--- a/sys/fs/nfs/nfs_commonacl.c
+++ b/sys/fs/nfs/nfs_commonacl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfs/nfscl.h b/sys/fs/nfs/nfscl.h
index 07b5e727461c..1d5f7983735a 100644
--- a/sys/fs/nfs/nfscl.h
+++ b/sys/fs/nfs/nfscl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfs/nfsclstate.h b/sys/fs/nfs/nfsclstate.h
index 2b9b804a08dd..b503c9e0bcb5 100644
--- a/sys/fs/nfs/nfsclstate.h
+++ b/sys/fs/nfs/nfsclstate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfs/nfsdport.h b/sys/fs/nfs/nfsdport.h
index 26bd57d5736d..a4513aa14c99 100644
--- a/sys/fs/nfs/nfsdport.h
+++ b/sys/fs/nfs/nfsdport.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfs/nfskpiport.h b/sys/fs/nfs/nfskpiport.h
index c605bc9d8253..d9387e533bd5 100644
--- a/sys/fs/nfs/nfskpiport.h
+++ b/sys/fs/nfs/nfskpiport.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfs/nfsrvstate.h b/sys/fs/nfs/nfsrvstate.h
index 4dc9729a952f..7cb5faf19716 100644
--- a/sys/fs/nfs/nfsrvstate.h
+++ b/sys/fs/nfs/nfsrvstate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfs/nfsv4_errstr.h b/sys/fs/nfs/nfsv4_errstr.h
index 81fe242db601..1a15e4fd9f5d 100644
--- a/sys/fs/nfs/nfsv4_errstr.h
+++ b/sys/fs/nfs/nfsv4_errstr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfsclient/nfs_clkdtrace.c b/sys/fs/nfsclient/nfs_clkdtrace.c
index 7a1281524401..5ca734665d37 100644
--- a/sys/fs/nfsclient/nfs_clkdtrace.c
+++ b/sys/fs/nfsclient/nfs_clkdtrace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c
index 3779a323e04c..e16a6064ac1e 100644
--- a/sys/fs/nfsclient/nfs_clstate.c
+++ b/sys/fs/nfsclient/nfs_clstate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/nfsclient/nfs_kdtrace.h b/sys/fs/nfsclient/nfs_kdtrace.h
index b82c42a6446c..4e07cf344273 100644
--- a/sys/fs/nfsclient/nfs_kdtrace.h
+++ b/sys/fs/nfsclient/nfs_kdtrace.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/fs/nfsserver/nfs_fha_new.c b/sys/fs/nfsserver/nfs_fha_new.c
index 20343c7c846f..1b33deb8ee3e 100644
--- a/sys/fs/nfsserver/nfs_fha_new.c
+++ b/sys/fs/nfsserver/nfs_fha_new.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Copyright (c) 2013 Spectra Logic Corporation
diff --git a/sys/fs/nfsserver/nfs_fha_new.h b/sys/fs/nfsserver/nfs_fha_new.h
index 5510fa2891f1..f5b1e78c1e1d 100644
--- a/sys/fs/nfsserver/nfs_fha_new.h
+++ b/sys/fs/nfsserver/nfs_fha_new.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Copyright (c) 2013 Spectra Logic Corporation
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 6e6d78b4d491..4e7a75b3c637 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h
index 1257aaf9554b..b2160e97c175 100644
--- a/sys/fs/smbfs/smbfs.h
+++ b/sys/fs/smbfs/smbfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 0927ec420cf5..78fd404ad1b9 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index a0aa26b80810..45535c5fa140 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_node.h b/sys/fs/smbfs/smbfs_node.h
index 4af6b8dd837f..9143983ae89a 100644
--- a/sys/fs/smbfs/smbfs_node.h
+++ b/sys/fs/smbfs/smbfs_node.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index e674ddd0d2b6..c3d0d02e2848 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_subr.c b/sys/fs/smbfs/smbfs_subr.c
index ed7a6d1e89ad..79233f4f64bb 100644
--- a/sys/fs/smbfs/smbfs_subr.c
+++ b/sys/fs/smbfs/smbfs_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_subr.h b/sys/fs/smbfs/smbfs_subr.h
index 1687dc17b2dd..130bb6acc239 100644
--- a/sys/fs/smbfs/smbfs_subr.h
+++ b/sys/fs/smbfs/smbfs_subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index bb69e288105e..420740c68ad3 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index 19f9be932b99..df2a1761dcfe 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/fs/udf/ecma167-udf.h b/sys/fs/udf/ecma167-udf.h
index f920e08202dc..40ea8cee71b8 100644
--- a/sys/fs/udf/ecma167-udf.h
+++ b/sys/fs/udf/ecma167-udf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h
index 33bf4539c41b..b210427a63d7 100644
--- a/sys/fs/udf/udf.h
+++ b/sys/fs/udf/udf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
diff --git a/sys/fs/udf/udf_iconv.c b/sys/fs/udf/udf_iconv.c
index 6ffdc01eea87..1337eb03e88f 100644
--- a/sys/fs/udf/udf_iconv.c
+++ b/sys/fs/udf/udf_iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
diff --git a/sys/fs/udf/udf_mount.h b/sys/fs/udf/udf_mount.h
index 8451510dc79f..ce9c14cf017a 100644
--- a/sys/fs/udf/udf_mount.h
+++ b/sys/fs/udf/udf_mount.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 502d927ac0fe..3f6f481dfd6b 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 2cda9ed75393..3dcf38cae0cf 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
diff --git a/sys/gdb/gdb.h b/sys/gdb/gdb.h
index aaf76756c459..5222d1287978 100644
--- a/sys/gdb/gdb.h
+++ b/sys/gdb/gdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/gdb/gdb_cons.c b/sys/gdb/gdb_cons.c
index c83236050d5b..68d53a3a615c 100644
--- a/sys/gdb/gdb_cons.c
+++ b/sys/gdb/gdb_cons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Sam Leffler
* All rights reserved.
diff --git a/sys/gdb/gdb_int.h b/sys/gdb/gdb_int.h
index 7dd8fa5e62ef..a2aba012e3d7 100644
--- a/sys/gdb/gdb_int.h
+++ b/sys/gdb/gdb_int.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/gdb/gdb_main.c b/sys/gdb/gdb_main.c
index de68e8c476b1..32b2b6ee5c9c 100644
--- a/sys/gdb/gdb_main.c
+++ b/sys/gdb/gdb_main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/gdb/gdb_packet.c b/sys/gdb/gdb_packet.c
index 11ed5358848d..550d15dfabe1 100644
--- a/sys/gdb/gdb_packet.c
+++ b/sys/gdb/gdb_packet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/gdb/netgdb.c b/sys/gdb/netgdb.c
index e10f864173c4..dc426adea766 100644
--- a/sys/gdb/netgdb.c
+++ b/sys/gdb/netgdb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
*
diff --git a/sys/gdb/netgdb.h b/sys/gdb/netgdb.h
index 36f369312290..31c27c132574 100644
--- a/sys/gdb/netgdb.h
+++ b/sys/gdb/netgdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
*
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index c9ef244bac81..8c6ed586a4fe 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/sys/geom/bde/g_bde.h b/sys/geom/bde/g_bde.h
index 3f36bb4281ae..d076e2fed916 100644
--- a/sys/geom/bde/g_bde.h
+++ b/sys/geom/bde/g_bde.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/sys/geom/bde/g_bde_crypt.c b/sys/geom/bde/g_bde_crypt.c
index 1312140186ff..60c260de461d 100644
--- a/sys/geom/bde/g_bde_crypt.c
+++ b/sys/geom/bde/g_bde_crypt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c
index 9a876d1b309d..8c3effbf087d 100644
--- a/sys/geom/bde/g_bde_lock.c
+++ b/sys/geom/bde/g_bde_lock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c
index 346870c7494d..6787ca5646d1 100644
--- a/sys/geom/bde/g_bde_work.c
+++ b/sys/geom/bde/g_bde_work.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c
index 86c2a9bb36a2..e907e0f5885e 100644
--- a/sys/geom/cache/g_cache.c
+++ b/sys/geom/cache/g_cache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/cache/g_cache.h b/sys/geom/cache/g_cache.h
index 60caf19a4a8d..85a4c534f47a 100644
--- a/sys/geom/cache/g_cache.h
+++ b/sys/geom/cache/g_cache.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index 6db293b07146..7e6950e56e79 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/concat/g_concat.h b/sys/geom/concat/g_concat.h
index 32e60b1b4cb2..5294c88362d2 100644
--- a/sys/geom/concat/g_concat.h
+++ b/sys/geom/concat/g_concat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 2dc93b1d9956..de6a26b3aaa8 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2019 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli.h b/sys/geom/eli/g_eli.h
index d07afe0c8a61..420968972b68 100644
--- a/sys/geom/eli/g_eli.h
+++ b/sys/geom/eli/g_eli.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2019 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli_crypto.c b/sys/geom/eli/g_eli_crypto.c
index ca8170db7e4d..6984db1f75b3 100644
--- a/sys/geom/eli/g_eli_crypto.c
+++ b/sys/geom/eli/g_eli_crypto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c
index 8c58d6147b8c..28dba07e1f1f 100644
--- a/sys/geom/eli/g_eli_ctl.c
+++ b/sys/geom/eli/g_eli_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli_integrity.c b/sys/geom/eli/g_eli_integrity.c
index d9ac0a2a3d72..985ead97872c 100644
--- a/sys/geom/eli/g_eli_integrity.c
+++ b/sys/geom/eli/g_eli_integrity.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli_key.c b/sys/geom/eli/g_eli_key.c
index a47a852f6ec9..f6f80943eb3e 100644
--- a/sys/geom/eli/g_eli_key.c
+++ b/sys/geom/eli/g_eli_key.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli_key_cache.c b/sys/geom/eli/g_eli_key_cache.c
index cc60be89b815..854fc4941e7d 100644
--- a/sys/geom/eli/g_eli_key_cache.c
+++ b/sys/geom/eli/g_eli_key_cache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2019 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/g_eli_privacy.c b/sys/geom/eli/g_eli_privacy.c
index adb353441e3d..0c3ee5e2cc1e 100644
--- a/sys/geom/eli/g_eli_privacy.c
+++ b/sys/geom/eli/g_eli_privacy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
diff --git a/sys/geom/eli/pkcs5v2.c b/sys/geom/eli/pkcs5v2.c
index c9c3984a3838..79cc01219da6 100644
--- a/sys/geom/eli/pkcs5v2.c
+++ b/sys/geom/eli/pkcs5v2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/eli/pkcs5v2.h b/sys/geom/eli/pkcs5v2.h
index da812e98c961..6ac53db8eb09 100644
--- a/sys/geom/eli/pkcs5v2.h
+++ b/sys/geom/eli/pkcs5v2.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index 4e98d78c1e43..0ebe6d64bf55 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* Copyright (c) 2009-2010 The FreeBSD Foundation
diff --git a/sys/geom/gate/g_gate.h b/sys/geom/gate/g_gate.h
index 91c526b83de0..6e22a57bf19a 100644
--- a/sys/geom/gate/g_gate.h
+++ b/sys/geom/gate/g_gate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/geom_dbg.h b/sys/geom/geom_dbg.h
index 455d80f45577..2d531c9f892e 100644
--- a/sys/geom/geom_dbg.h
+++ b/sys/geom/geom_dbg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/geom/geom_flashmap.c b/sys/geom/geom_flashmap.c
index 71007a4f7936..7a9063672d03 100644
--- a/sys/geom/geom_flashmap.c
+++ b/sys/geom/geom_flashmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Semihalf
* Copyright (c) 2009 Jakub Klama <jakub.klama@uj.edu.pl>
diff --git a/sys/geom/geom_map.c b/sys/geom/geom_map.c
index 3d6e22c4c5ca..0c633d02909f 100644
--- a/sys/geom/geom_map.c
+++ b/sys/geom/geom_map.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Aleksandr Rybalko <ray@dlink.ua>
* based on geom_redboot.c
diff --git a/sys/geom/geom_redboot.c b/sys/geom/geom_redboot.c
index 8f21dc30526e..9fff13907d42 100644
--- a/sys/geom/geom_redboot.c
+++ b/sys/geom/geom_redboot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c
index 592062b8b12a..a90b0ec4e7e3 100644
--- a/sys/geom/geom_vfs.c
+++ b/sys/geom/geom_vfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/geom/geom_vfs.h b/sys/geom/geom_vfs.h
index 6152862ed7a3..7133c1e3e342 100644
--- a/sys/geom/geom_vfs.h
+++ b/sys/geom/geom_vfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index eba0f0dcab34..34ac23c2214c 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/journal/g_journal.h b/sys/geom/journal/g_journal.h
index 45a6f39f0e53..6602f6e946a6 100644
--- a/sys/geom/journal/g_journal.h
+++ b/sys/geom/journal/g_journal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/journal/g_journal_ufs.c b/sys/geom/journal/g_journal_ufs.c
index dec28e547f82..1f25358deaf5 100644
--- a/sys/geom/journal/g_journal_ufs.c
+++ b/sys/geom/journal/g_journal_ufs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index 8f6ac38179a6..bfe66f5d894a 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index 60df7e68a12b..21590700c0b2 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/label/g_label_disk_ident.c b/sys/geom/label/g_label_disk_ident.c
index ac0e8dd83ce1..d43a5b32a6df 100644
--- a/sys/geom/label/g_label_disk_ident.c
+++ b/sys/geom/label/g_label_disk_ident.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ivan Voras <ivoras@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/label/g_label_ext2fs.c b/sys/geom/label/g_label_ext2fs.c
index 0f21de1ce313..152b64d214d3 100644
--- a/sys/geom/label/g_label_ext2fs.c
+++ b/sys/geom/label/g_label_ext2fs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Stanislav Sedov
* All rights reserved.
diff --git a/sys/geom/label/g_label_flashmap.c b/sys/geom/label/g_label_flashmap.c
index c19f5fe3ee97..fe7ef69414ea 100644
--- a/sys/geom/label/g_label_flashmap.c
+++ b/sys/geom/label/g_label_flashmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Ian Lepore <ian@FreeBSD.org>
*
diff --git a/sys/geom/label/g_label_gpt.c b/sys/geom/label/g_label_gpt.c
index 13f161735aca..d6699676bf67 100644
--- a/sys/geom/label/g_label_gpt.c
+++ b/sys/geom/label/g_label_gpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marius Nuennerich
* All rights reserved.
diff --git a/sys/geom/label/g_label_iso9660.c b/sys/geom/label/g_label_iso9660.c
index 1ac7283b34e6..a4a4c872d144 100644
--- a/sys/geom/label/g_label_iso9660.c
+++ b/sys/geom/label/g_label_iso9660.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/label/g_label_msdosfs.c b/sys/geom/label/g_label_msdosfs.c
index 9ee052c7c1ef..0aa484bb910d 100644
--- a/sys/geom/label/g_label_msdosfs.c
+++ b/sys/geom/label/g_label_msdosfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* Copyright (c) 2006 Tobias Reifenberger
diff --git a/sys/geom/label/g_label_msdosfs.h b/sys/geom/label/g_label_msdosfs.h
index 57fb4e38fc18..295590615f3b 100644
--- a/sys/geom/label/g_label_msdosfs.h
+++ b/sys/geom/label/g_label_msdosfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Tobias Reifenberger
* All rights reserved.
diff --git a/sys/geom/label/g_label_ntfs.c b/sys/geom/label/g_label_ntfs.c
index bcaeebce99f2..734e02f53da7 100644
--- a/sys/geom/label/g_label_ntfs.c
+++ b/sys/geom/label/g_label_ntfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Takanori Watanabe
* All rights reserved.
diff --git a/sys/geom/label/g_label_reiserfs.c b/sys/geom/label/g_label_reiserfs.c
index 8fe1a72458e4..804c8b6c584f 100644
--- a/sys/geom/label/g_label_reiserfs.c
+++ b/sys/geom/label/g_label_reiserfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Stanislav Sedov
* All rights reserved.
diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c
index 8b2776e034fe..80fa1ae8f772 100644
--- a/sys/geom/label/g_label_ufs.c
+++ b/sys/geom/label/g_label_ufs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Gordon Tetlow
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c
index f17827757139..6fafeb79ee66 100644
--- a/sys/geom/linux_lvm/g_linux_lvm.c
+++ b/sys/geom/linux_lvm/g_linux_lvm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Andrew Thompson <thompsa@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/linux_lvm/g_linux_lvm.h b/sys/geom/linux_lvm/g_linux_lvm.h
index 9133a982a782..f594e5c09039 100644
--- a/sys/geom/linux_lvm/g_linux_lvm.h
+++ b/sys/geom/linux_lvm/g_linux_lvm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Andrew Thompson <thompsa@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index cb5129dabd33..8a2b44508eba 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h
index 7cec94adae18..4b3c10452a3d 100644
--- a/sys/geom/mirror/g_mirror.h
+++ b/sys/geom/mirror/g_mirror.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/mirror/g_mirror_ctl.c b/sys/geom/mirror/g_mirror_ctl.c
index 355504a6f90f..b05b22ff88c1 100644
--- a/sys/geom/mirror/g_mirror_ctl.c
+++ b/sys/geom/mirror/g_mirror_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c
index 9703f1d02529..4b4b7eaffc6d 100644
--- a/sys/geom/mountver/g_mountver.c
+++ b/sys/geom/mountver/g_mountver.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sys/geom/mountver/g_mountver.h b/sys/geom/mountver/g_mountver.h
index 34ca831384f6..19382ad0a6ce 100644
--- a/sys/geom/mountver/g_mountver.h
+++ b/sys/geom/mountver/g_mountver.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c
index a721b0bc4459..db20d5403b63 100644
--- a/sys/geom/multipath/g_multipath.c
+++ b/sys/geom/multipath/g_multipath.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2013 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2006-2007 Matthew Jacob <mjacob@FreeBSD.org>
diff --git a/sys/geom/multipath/g_multipath.h b/sys/geom/multipath/g_multipath.h
index 4d6ef5b40cdc..3f4628d183bf 100644
--- a/sys/geom/multipath/g_multipath.h
+++ b/sys/geom/multipath/g_multipath.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2007 Matthew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 57208a0744db..0b329f43c31d 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* Copyright (c) 2019 Mariusz Zaborski <oshogbo@FreeBSD.org>
diff --git a/sys/geom/nop/g_nop.h b/sys/geom/nop/g_nop.h
index b8f086c56781..b540179c645e 100644
--- a/sys/geom/nop/g_nop.h
+++ b/sys/geom/nop/g_nop.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c
index a0981d89b042..1da9b9bb16e1 100644
--- a/sys/geom/part/g_part.c
+++ b/sys/geom/part/g_part.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2005-2009 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h
index 4987b7c54c0e..56534bef9bfb 100644
--- a/sys/geom/part/g_part.h
+++ b/sys/geom/part/g_part.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c
index aa008871d58f..eb15948d74a7 100644
--- a/sys/geom/part/g_part_apm.c
+++ b/sys/geom/part/g_part_apm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part_bsd.c b/sys/geom/part/g_part_bsd.c
index 0f23a277ce8e..f95cd3fa66c7 100644
--- a/sys/geom/part/g_part_bsd.c
+++ b/sys/geom/part/g_part_bsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c
index 1eb8e30d8adf..e632472bcf6b 100644
--- a/sys/geom/part/g_part_ebr.c
+++ b/sys/geom/part/g_part_ebr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index 702474e23cd0..8821ee98148e 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2005-2007, 2011 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part_ldm.c b/sys/geom/part/g_part_ldm.c
index e53578f57fee..c519ef7fa877 100644
--- a/sys/geom/part/g_part_ldm.c
+++ b/sys/geom/part/g_part_ldm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Andrey V. Elsukov <ae@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c
index 750d417bba5d..b122217fc9aa 100644
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/part/g_part_vtoc8.c b/sys/geom/part/g_part_vtoc8.c
index c32d8e32eeaf..37ee7cf1c030 100644
--- a/sys/geom/part/g_part_vtoc8.c
+++ b/sys/geom/part/g_part_vtoc8.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c
index 3b8f3974a495..f679dcc021be 100644
--- a/sys/geom/raid/g_raid.c
+++ b/sys/geom/raid/g_raid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/g_raid.h b/sys/geom/raid/g_raid.h
index 720d588d9118..b44a95d42024 100644
--- a/sys/geom/raid/g_raid.h
+++ b/sys/geom/raid/g_raid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/g_raid_ctl.c b/sys/geom/raid/g_raid_ctl.c
index 7ca4a8588d02..544c57d7e7c5 100644
--- a/sys/geom/raid/g_raid_ctl.c
+++ b/sys/geom/raid/g_raid_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/md_ddf.c b/sys/geom/raid/md_ddf.c
index d4ceae343447..bd7e8825a427 100644
--- a/sys/geom/raid/md_ddf.c
+++ b/sys/geom/raid/md_ddf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/md_ddf.h b/sys/geom/raid/md_ddf.h
index bee94755efc4..1477fc466b5d 100644
--- a/sys/geom/raid/md_ddf.h
+++ b/sys/geom/raid/md_ddf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2008 Scott Long
diff --git a/sys/geom/raid/md_intel.c b/sys/geom/raid/md_intel.c
index 54fa7535bc0e..093603d14b83 100644
--- a/sys/geom/raid/md_intel.c
+++ b/sys/geom/raid/md_intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
diff --git a/sys/geom/raid/md_jmicron.c b/sys/geom/raid/md_jmicron.c
index 02da9e1f02ab..6a98e00ff6f5 100644
--- a/sys/geom/raid/md_jmicron.c
+++ b/sys/geom/raid/md_jmicron.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
diff --git a/sys/geom/raid/md_nvidia.c b/sys/geom/raid/md_nvidia.c
index 79ec18fe17d7..113fff5ad58c 100644
--- a/sys/geom/raid/md_nvidia.c
+++ b/sys/geom/raid/md_nvidia.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c
index dc9f444f2ac4..eb6985e52259 100644
--- a/sys/geom/raid/md_promise.c
+++ b/sys/geom/raid/md_promise.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
diff --git a/sys/geom/raid/md_sii.c b/sys/geom/raid/md_sii.c
index 06d58d45fe30..89af2ca27c91 100644
--- a/sys/geom/raid/md_sii.c
+++ b/sys/geom/raid/md_sii.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c
index a0a69502206f..eac62b3171d2 100644
--- a/sys/geom/raid/tr_concat.c
+++ b/sys/geom/raid/tr_concat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/tr_raid0.c b/sys/geom/raid/tr_raid0.c
index 43782a0956a2..68562f1ae6d6 100644
--- a/sys/geom/raid/tr_raid0.c
+++ b/sys/geom/raid/tr_raid0.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/tr_raid1.c b/sys/geom/raid/tr_raid1.c
index 7a6f76a3137d..04737bac6a9d 100644
--- a/sys/geom/raid/tr_raid1.c
+++ b/sys/geom/raid/tr_raid1.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/tr_raid1e.c b/sys/geom/raid/tr_raid1e.c
index 937d5ee8bb08..23dc0843b079 100644
--- a/sys/geom/raid/tr_raid1e.c
+++ b/sys/geom/raid/tr_raid1e.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid/tr_raid5.c b/sys/geom/raid/tr_raid5.c
index 5fa4edd49248..10b3954cd75d 100644
--- a/sys/geom/raid/tr_raid5.c
+++ b/sys/geom/raid/tr_raid5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index 27925b5e49f3..96584b615927 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h
index 8f0d92dee7ef..716753c271cc 100644
--- a/sys/geom/raid3/g_raid3.h
+++ b/sys/geom/raid3/g_raid3.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c
index 7d913b6df1b0..b91da7d34446 100644
--- a/sys/geom/raid3/g_raid3_ctl.c
+++ b/sys/geom/raid3/g_raid3_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index 5ca00b64219d..b9a44ac8f40f 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/shsec/g_shsec.h b/sys/geom/shsec/g_shsec.h
index 7da43e0edde5..e41b391e5910 100644
--- a/sys/geom/shsec/g_shsec.h
+++ b/sys/geom/shsec/g_shsec.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 3ae6a0e3f871..a3ea2db3dc8b 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/stripe/g_stripe.h b/sys/geom/stripe/g_stripe.h
index 90b97426713c..ce8b0d5ecb7e 100644
--- a/sys/geom/stripe/g_stripe.h
+++ b/sys/geom/stripe/g_stripe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 333f16910c5a..2ebaa51d8ffb 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Max Khon
* Copyright (c) 2014 Juniper Networks, Inc.
diff --git a/sys/geom/uzip/g_uzip_zstd.c b/sys/geom/uzip/g_uzip_zstd.c
index 27b246242186..5b48c1bade02 100644
--- a/sys/geom/uzip/g_uzip_zstd.c
+++ b/sys/geom/uzip/g_uzip_zstd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/geom/uzip/g_uzip_zstd.h b/sys/geom/uzip/g_uzip_zstd.h
index adb76882f76b..7ea35de438ab 100644
--- a/sys/geom/uzip/g_uzip_zstd.h
+++ b/sys/geom/uzip/g_uzip_zstd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 86f5c9f08e1f..518e9bd94016 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 2007, 2009 Ulf Lilleengen
diff --git a/sys/geom/vinum/geom_vinum.h b/sys/geom/vinum/geom_vinum.h
index 5fc18e0280ce..469e5612cc5d 100644
--- a/sys/geom/vinum/geom_vinum.h
+++ b/sys/geom/vinum/geom_vinum.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_create.c b/sys/geom/vinum/geom_vinum_create.c
index 42caa112e8fc..b5885e7393c6 100644
--- a/sys/geom/vinum/geom_vinum_create.c
+++ b/sys/geom/vinum/geom_vinum_create.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Lukas Ertl
* Copyright (c) 2007, 2009 Ulf Lilleengen
diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c
index 055a60df3468..6fa2af8a071d 100644
--- a/sys/geom/vinum/geom_vinum_drive.c
+++ b/sys/geom/vinum/geom_vinum_drive.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_events.c b/sys/geom/vinum/geom_vinum_events.c
index 74b9bbe4de9d..f02cddb1184f 100644
--- a/sys/geom/vinum/geom_vinum_events.c
+++ b/sys/geom/vinum/geom_vinum_events.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_init.c b/sys/geom/vinum/geom_vinum_init.c
index 115a3c66d445..7d32c4f9e5f3 100644
--- a/sys/geom/vinum/geom_vinum_init.c
+++ b/sys/geom/vinum/geom_vinum_init.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 2007, 2009 Ulf Lilleengen
diff --git a/sys/geom/vinum/geom_vinum_list.c b/sys/geom/vinum/geom_vinum_list.c
index bc079d57387c..d9dcd36d883f 100644
--- a/sys/geom/vinum/geom_vinum_list.c
+++ b/sys/geom/vinum/geom_vinum_list.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_move.c b/sys/geom/vinum/geom_vinum_move.c
index f2f38a69d103..84c90ef12819 100644
--- a/sys/geom/vinum/geom_vinum_move.c
+++ b/sys/geom/vinum/geom_vinum_move.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Chris Jones
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c
index f3895f5b80ff..852df107ead6 100644
--- a/sys/geom/vinum/geom_vinum_plex.c
+++ b/sys/geom/vinum/geom_vinum_plex.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* Copyright (c) 2007, 2009 Ulf Lilleengen
diff --git a/sys/geom/vinum/geom_vinum_raid5.c b/sys/geom/vinum/geom_vinum_raid5.c
index 1c30834ec298..d7e657503b7b 100644
--- a/sys/geom/vinum/geom_vinum_raid5.c
+++ b/sys/geom/vinum/geom_vinum_raid5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_raid5.h b/sys/geom/vinum/geom_vinum_raid5.h
index ae49234b6da9..7c9762618993 100644
--- a/sys/geom/vinum/geom_vinum_raid5.h
+++ b/sys/geom/vinum/geom_vinum_raid5.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_rename.c b/sys/geom/vinum/geom_vinum_rename.c
index 688673268ef9..98af8887cd99 100644
--- a/sys/geom/vinum/geom_vinum_rename.c
+++ b/sys/geom/vinum/geom_vinum_rename.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Chris Jones
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_rm.c b/sys/geom/vinum/geom_vinum_rm.c
index 6bd4c28d9e48..f3ea22db13eb 100644
--- a/sys/geom/vinum/geom_vinum_rm.c
+++ b/sys/geom/vinum/geom_vinum_rm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_share.h b/sys/geom/vinum/geom_vinum_share.h
index f327c10c0072..18e0ceef380f 100644
--- a/sys/geom/vinum/geom_vinum_share.h
+++ b/sys/geom/vinum/geom_vinum_share.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_state.c b/sys/geom/vinum/geom_vinum_state.c
index 867240ff2157..fe5feb3fa544 100644
--- a/sys/geom/vinum/geom_vinum_state.c
+++ b/sys/geom/vinum/geom_vinum_state.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/vinum/geom_vinum_volume.c b/sys/geom/vinum/geom_vinum_volume.c
index 63b1077a26fa..744b13f22b56 100644
--- a/sys/geom/vinum/geom_vinum_volume.c
+++ b/sys/geom/vinum/geom_vinum_volume.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Lukas Ertl
* All rights reserved.
diff --git a/sys/geom/virstor/binstream.c b/sys/geom/virstor/binstream.c
index f52ce738b17b..e813adf70f49 100644
--- a/sys/geom/virstor/binstream.c
+++ b/sys/geom/virstor/binstream.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ivan Voras <ivoras@gmail.com>
* All rights reserved.
diff --git a/sys/geom/virstor/binstream.h b/sys/geom/virstor/binstream.h
index 4171ad2e6156..140e287da344 100644
--- a/sys/geom/virstor/binstream.h
+++ b/sys/geom/virstor/binstream.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ivan Voras <ivoras@gmail.com>
* All rights reserved.
diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c
index 8e4725997ab2..cc4147f09f48 100644
--- a/sys/geom/virstor/g_virstor.c
+++ b/sys/geom/virstor/g_virstor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2007 Ivan Voras <ivoras@freebsd.org>
* All rights reserved.
diff --git a/sys/geom/virstor/g_virstor.h b/sys/geom/virstor/g_virstor.h
index 0d918ac70a0c..5fe5eb534c7b 100644
--- a/sys/geom/virstor/g_virstor.h
+++ b/sys/geom/virstor/g_virstor.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2007 Ivan Voras <ivoras@freebsd.org>
* All rights reserved.
diff --git a/sys/geom/virstor/g_virstor_md.c b/sys/geom/virstor/g_virstor_md.c
index 297ec9a7c50b..f51783a803c2 100644
--- a/sys/geom/virstor/g_virstor_md.c
+++ b/sys/geom/virstor/g_virstor_md.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ivan Voras <ivoras@freebsd.org>
* All rights reserved.
diff --git a/sys/geom/virstor/g_virstor_md.h b/sys/geom/virstor/g_virstor_md.h
index 8cb47d87535d..f635dd807ed6 100644
--- a/sys/geom/virstor/g_virstor_md.h
+++ b/sys/geom/virstor/g_virstor_md.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Ivan Voras <ivoras@gmail.com>
* All rights reserved.
diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index c533a758a236..805b99925bdf 100644
--- a/sys/geom/zero/g_zero.c
+++ b/sys/geom/zero/g_zero.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/gnu/gcov/gcov.h b/sys/gnu/gcov/gcov.h
index 3ee775dbfe77..b20c946ec306 100644
--- a/sys/gnu/gcov/gcov.h
+++ b/sys/gnu/gcov/gcov.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/gnu/gcov/gcov_subr.c b/sys/gnu/gcov/gcov_subr.c
index 0ac0b1cfe7c6..0d8ea7ad1a84 100644
--- a/sys/gnu/gcov/gcov_subr.c
+++ b/sys/gnu/gcov/gcov_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index e8810ac88009..f5c9f4027021 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index 682e9613962f..5f4841d76833 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
* Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index 653399e1ca58..ab91ab61f23c 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 48cf1ad9ade1..41dabcfe4760 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
diff --git a/sys/i386/i386/copyout.c b/sys/i386/i386/copyout.c
index ed875c09d65a..16d856a3327a 100644
--- a/sys/i386/i386/copyout.c
+++ b/sys/i386/i386/copyout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/i386/copyout_fast.s b/sys/i386/i386/copyout_fast.s
index 2aa17a5c45c8..c67ab7597d3a 100644
--- a/sys/i386/i386/copyout_fast.s
+++ b/sys/i386/i386/copyout_fast.s
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index 4ef57be5afc3..e84f18346a0b 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c
index 7523787da536..27d86971dc5c 100644
--- a/sys/i386/i386/gdb_machdep.c
+++ b/sys/i386/i386/gdb_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c
index 4d8bf0477abe..b27f9c9d05ce 100644
--- a/sys/i386/i386/geode.c
+++ b/sys/i386/i386/geode.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index ee2d7ec224e5..f4c7f2c63103 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) KATO Takenori, 1997, 1998.
*
diff --git a/sys/i386/i386/io.c b/sys/i386/i386/io.c
index 7cc9179d4472..4a2aa9741994 100644
--- a/sys/i386/i386/io.c
+++ b/sys/i386/i386/io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index 2968518ee534..d5af9a3eea49 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Fundakowski Feldman
* All rights reserved.
diff --git a/sys/i386/i386/minidump_machdep.c b/sys/i386/i386/minidump_machdep.c
index 6d3585795208..9842d8138b43 100644
--- a/sys/i386/i386/minidump_machdep.c
+++ b/sys/i386/i386/minidump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/i386/i386/minidump_machdep_base.c b/sys/i386/i386/minidump_machdep_base.c
index 5072474b9f8a..f58172b7c121 100644
--- a/sys/i386/i386/minidump_machdep_base.c
+++ b/sys/i386/i386/minidump_machdep_base.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/i386/i386/minidump_machdep_nopae.c b/sys/i386/i386/minidump_machdep_nopae.c
index ce1aa26cd016..1bfb844f125a 100644
--- a/sys/i386/i386/minidump_machdep_nopae.c
+++ b/sys/i386/i386/minidump_machdep_nopae.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/i386/minidump_machdep_pae.c b/sys/i386/i386/minidump_machdep_pae.c
index 7c7f1d6a1cc2..523302e76235 100644
--- a/sys/i386/i386/minidump_machdep_pae.c
+++ b/sys/i386/i386/minidump_machdep_pae.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index bf1c7faf6182..932bcae4a55b 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
diff --git a/sys/i386/i386/pmap_nopae.c b/sys/i386/i386/pmap_nopae.c
index a19885545c12..4b65a42903d0 100644
--- a/sys/i386/i386/pmap_nopae.c
+++ b/sys/i386/i386/pmap_nopae.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/i386/i386/pmap_pae.c b/sys/i386/i386/pmap_pae.c
index 6592e9641af6..2e622afe9cc2 100644
--- a/sys/i386/i386/pmap_pae.c
+++ b/sys/i386/i386/pmap_pae.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/i386/prof_machdep.c b/sys/i386/i386/prof_machdep.c
index 55bf5d3da892..7e2fb11dd9de 100644
--- a/sys/i386/i386/prof_machdep.c
+++ b/sys/i386/i386/prof_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 Bruce D. Evans.
* All rights reserved.
diff --git a/sys/i386/i386/ptrace_machdep.c b/sys/i386/i386/ptrace_machdep.c
index 29551336f8a6..cbf04e602d05 100644
--- a/sys/i386/i386/ptrace_machdep.c
+++ b/sys/i386/i386/ptrace_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index d125391ae905..592760bd1f51 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
diff --git a/sys/i386/include/_bus.h b/sys/i386/include/_bus.h
index bd716938af6d..5d6ad1975354 100644
--- a/sys/i386/include/_bus.h
+++ b/sys/i386/include/_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index 154144a470c6..b0ad4f4c6bb5 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 536840321e1f..0355db5cf8ee 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Scott Long
* All rights reserved.
diff --git a/sys/i386/include/counter.h b/sys/i386/include/counter.h
index 1fd624b133fc..1b3fc4c638e7 100644
--- a/sys/i386/include/counter.h
+++ b/sys/i386/include/counter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/i386/include/elan_mmcr.h b/sys/i386/include/elan_mmcr.h
index a337d8383922..794876f193df 100644
--- a/sys/i386/include/elan_mmcr.h
+++ b/sys/i386/include/elan_mmcr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 John Birrell
* All rights reserved.
diff --git a/sys/i386/include/gdb_machdep.h b/sys/i386/include/gdb_machdep.h
index 77eb70e2fb28..a2a366b77a45 100644
--- a/sys/i386/include/gdb_machdep.h
+++ b/sys/i386/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/i386/include/iodev.h b/sys/i386/include/iodev.h
index 5aced158609e..253e4dc15ce4 100644
--- a/sys/i386/include/iodev.h
+++ b/sys/i386/include/iodev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/i386/include/kdb.h b/sys/i386/include/kdb.h
index 29a23fde0aad..53fbe6cbe908 100644
--- a/sys/i386/include/kdb.h
+++ b/sys/i386/include/kdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/i386/include/memdev.h b/sys/i386/include/memdev.h
index 1e37449aaa9d..e1db4bc9192d 100644
--- a/sys/i386/include/memdev.h
+++ b/sys/i386/include/memdev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/i386/include/minidump.h b/sys/i386/include/minidump.h
index 27a7097f0ae9..b43b94710848 100644
--- a/sys/i386/include/minidump.h
+++ b/sys/i386/include/minidump.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/i386/include/mp_watchdog.h b/sys/i386/include/mp_watchdog.h
index e1fc0742ee1e..46eb9c709e49 100644
--- a/sys/i386/include/mp_watchdog.h
+++ b/sys/i386/include/mp_watchdog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index eec5983bee46..83de6d703c26 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 1969709dbf0b..a55e04f34215 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 9e65d179dc36..6ded0e5b9d52 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Peter Wemm
* All rights reserved.
diff --git a/sys/i386/include/pcpu_aux.h b/sys/i386/include/pcpu_aux.h
index e30ac105a602..8ff94b64fec7 100644
--- a/sys/i386/include/pcpu_aux.h
+++ b/sys/i386/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/i386/include/pmap_base.h b/sys/i386/include/pmap_base.h
index 322d749c4591..a7089734dba0 100644
--- a/sys/i386/include/pmap_base.h
+++ b/sys/i386/include/pmap_base.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h
index 15bdd7a65dc8..7938160e2583 100644
--- a/sys/i386/include/pmc_mdep.h
+++ b/sys/i386/include/pmc_mdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2005,2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/i386/include/ppireg.h b/sys/i386/include/ppireg.h
index 9794504da499..f3695e37cf31 100644
--- a/sys/i386/include/ppireg.h
+++ b/sys/i386/include/ppireg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
diff --git a/sys/i386/include/runq.h b/sys/i386/include/runq.h
index ba21b9ab4316..2c98a4eadb2e 100644
--- a/sys/i386/include/runq.h
+++ b/sys/i386/include/runq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/i386/include/sf_buf.h b/sys/i386/include/sf_buf.h
index e66bf4cbe185..d4250b0ab418 100644
--- a/sys/i386/include/sf_buf.h
+++ b/sys/i386/include/sf_buf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/i386/include/smapi.h b/sys/i386/include/smapi.h
index 57eb1ee26e7f..ff2f56fa15cd 100644
--- a/sys/i386/include/smapi.h
+++ b/sys/i386/include/smapi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Matthew N. Dodd <winter@freebsd.org>
* All rights reserved.
diff --git a/sys/i386/include/timerreg.h b/sys/i386/include/timerreg.h
index 77e6cad5775d..4804ce98c6d8 100644
--- a/sys/i386/include/timerreg.h
+++ b/sys/i386/include/timerreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
diff --git a/sys/i386/include/vm.h b/sys/i386/include/vm.h
index fef7a53ca317..7d4f3e2cccdf 100644
--- a/sys/i386/include/vm.h
+++ b/sys/i386/include/vm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index ca71745fc074..a70363dac628 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 85357f41a705..ac072c0bb38a 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 91102eeaa2be..4784be5b0f77 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c
index 833d25b911c9..def3c965d404 100644
--- a/sys/i386/linux/linux_copyout.c
+++ b/sys/i386/linux/linux_copyout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/i386/linux/linux_dummy_machdep.c b/sys/i386/linux/linux_dummy_machdep.c
index 87edfed4a17d..be381369823b 100644
--- a/sys/i386/linux/linux_dummy_machdep.c
+++ b/sys/i386/linux/linux_dummy_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 898192efc99d..daae6a9f711b 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/i386/linux/linux_ptrace_machdep.c b/sys/i386/linux/linux_ptrace_machdep.c
index d9e0ed50c750..f863e7f109aa 100644
--- a/sys/i386/linux/linux_ptrace_machdep.c
+++ b/sys/i386/linux/linux_ptrace_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Alexander Kabaev
* All rights reserved.
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index fb6f01adf66d..c486fe1a09a5 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c
index f4f7472ce9d0..90029a132f7f 100644
--- a/sys/i386/linux/linux_vdso_gtod.c
+++ b/sys/i386/linux/linux_vdso_gtod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 928401d7b3bf..1d49763fb3c6 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 0d2257d526fe..a37ca0dba209 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 7bc66d552e31..4c66806ce82d 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
+ * SPDX-License-Identifier: BSD-2-Clause AND MIT
*
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 8bffbd8fea28..2998c075185a 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
diff --git a/sys/isa/isa_dmareg.h b/sys/isa/isa_dmareg.h
index 1ed8badebae9..41f9d2b01183 100644
--- a/sys/isa/isa_dmareg.h
+++ b/sys/isa/isa_dmareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index e553bda506df..75f8ade70c53 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 81ba280da457..fea8f3b3d1a0 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/isa/pnp.c b/sys/isa/pnp.c
index 768c2c4dd3ed..1230a37bcb7d 100644
--- a/sys/isa/pnp.c
+++ b/sys/isa/pnp.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, Sujal M. Patel
* All rights reserved.
diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c
index 979389f59808..1bf98e101bea 100644
--- a/sys/isa/pnpparse.c
+++ b/sys/isa/pnpparse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
diff --git a/sys/isa/pnpvar.h b/sys/isa/pnpvar.h
index 1f77b1b28690..ae61aef3150d 100644
--- a/sys/isa/pnpvar.h
+++ b/sys/isa/pnpvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index d69652abe26a..475e6c05c814 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 0d1f042fa78f..1228a4399aa9 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
diff --git a/sys/kern/genoffset.c b/sys/kern/genoffset.c
index 11ba6372ae8f..e3d42c8c6b79 100644
--- a/sys/kern/genoffset.c
+++ b/sys/kern/genoffset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/kern/genoffset.sh b/sys/kern/genoffset.sh
index aedccfd84c6e..0caeabf0ca59 100644
--- a/sys/kern/genoffset.sh
+++ b/sys/kern/genoffset.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2000, Bruce Evans <bde@freebsd.org>
# Copyright (c) 2018, Jeff Roberson <jeff@freebsd.org>
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index ceb305e33756..275fc4e8f3e1 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1993, David Greenman
* All rights reserved.
diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c
index a25022e6f66d..9ddbbe20f8f3 100644
--- a/sys/kern/imgact_elf32.c
+++ b/sys/kern/imgact_elf32.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/imgact_elf64.c b/sys/kern/imgact_elf64.c
index 3c1181ff9a5c..142116ba11fd 100644
--- a/sys/kern/imgact_elf64.c
+++ b/sys/kern/imgact_elf64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index d5287a4e95d1..831475d37ffe 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1993, David Greenman
* All rights reserved.
diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c
index 6db4ab300828..cfe1f2e725ca 100644
--- a/sys/kern/kern_alq.c
+++ b/sys/kern/kern_alq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c
index 89d19bca9317..78093bb8b641 100644
--- a/sys/kern/kern_clocksource.c
+++ b/sys/kern/kern_clocksource.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index ffceee44a5c0..66738daa30c0 100644
--- a/sys/kern/kern_condvar.c
+++ b/sys/kern/kern_condvar.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 1cd5bc2635c1..c31235262910 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2002 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kern/kern_context.c b/sys/kern/kern_context.c
index 8612c95ae641..c7790d800a5d 100644
--- a/sys/kern/kern_context.c
+++ b/sys/kern/kern_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c
index 380849974a35..2f3d868f0af5 100644
--- a/sys/kern/kern_cpu.c
+++ b/sys/kern/kern_cpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2007 Nate Lawson (SDG)
* All rights reserved.
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
index dfc32d01295e..e4fa8d1abfd0 100644
--- a/sys/kern/kern_cpuset.c
+++ b/sys/kern/kern_cpuset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c
index 00eb6aaffb51..a6424c7b83df 100644
--- a/sys/kern/kern_ctf.c
+++ b/sys/kern/kern_ctf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 John Birrell <jb@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_dtrace.c b/sys/kern/kern_dtrace.c
index a57ca9d93568..1149d1de0cfc 100644
--- a/sys/kern/kern_dtrace.c
+++ b/sys/kern/kern_dtrace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 John Birrell <jb@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 77fdf833c530..1c216462917f 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith
* All rights reserved.
diff --git a/sys/kern/kern_et.c b/sys/kern/kern_et.c
index 6b0052c07b45..1c1985c60a52 100644
--- a/sys/kern/kern_et.c
+++ b/sys/kern/kern_et.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index a8aabd276d54..2c6a0068e67c 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
* Copyright 2004 John-Mark Gurney <jmg@FreeBSD.org>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index f8b71e6be35b..b220f675672a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1993, David Greenman
* All rights reserved.
diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c
index d10450ce1280..d4abc80c2c9e 100644
--- a/sys/kern/kern_fail.c
+++ b/sys/kern/kern_fail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Isilon Inc http://www.isilon.com/
*
diff --git a/sys/kern/kern_ffclock.c b/sys/kern/kern_ffclock.c
index 0ab8e35fbe02..14baae430e31 100644
--- a/sys/kern/kern_ffclock.c
+++ b/sys/kern/kern_ffclock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
diff --git a/sys/kern/kern_hhook.c b/sys/kern/kern_hhook.c
index fa30802664ac..43f0d46af8aa 100644
--- a/sys/kern/kern_hhook.c
+++ b/sys/kern/kern_hhook.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c
index 100900d1ae9e..496231ef91c5 100644
--- a/sys/kern/kern_idle.c
+++ b/sys/kern/kern_idle.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2000-2004 The FreeBSD Project. All rights reserved.
*
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 29e88ff42ae4..3a5c7ca821af 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index d43d2326cfec..94931dbd1653 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2008 Bjoern A. Zeeb.
diff --git a/sys/kern/kern_kcov.c b/sys/kern/kern_kcov.c
index cd1547f2ce43..5ea60d43d144 100644
--- a/sys/kern/kern_kcov.c
+++ b/sys/kern/kern_kcov.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
* Copyright (C) 2018, 2019 Andrew Turner
diff --git a/sys/kern/kern_khelp.c b/sys/kern/kern_khelp.c
index 4f8a4248ec25..d18b77133941 100644
--- a/sys/kern/kern_khelp.c
+++ b/sys/kern/kern_khelp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 782370b1ba77..ad05bc532c57 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c
index 79e4b6121054..2b0a99589cda 100644
--- a/sys/kern/kern_ktr.c
+++ b/sys/kern/kern_ktr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 1617e4f0d5b4..477c38173bbf 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2000 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index d9713ec06473..43107d095e39 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_lockstat.c b/sys/kern/kern_lockstat.c
index c5ab1c0c5fd1..a2982b4b3e3b 100644
--- a/sys/kern/kern_lockstat.c
+++ b/sys/kern/kern_lockstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008-2009 Stacey Son <sson@FreeBSD.org>
*
diff --git a/sys/kern/kern_loginclass.c b/sys/kern/kern_loginclass.c
index cb84d22e2932..97443cd40e56 100644
--- a/sys/kern/kern_loginclass.c
+++ b/sys/kern/kern_loginclass.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index a1a0157b88c0..6974127a09e2 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2005,
* Bosko Milekic <bmilekic@FreeBSD.org>. All rights reserved.
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 7128525ddb66..d4edc64a5ce4 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c
index 92cfeb5bd131..1bfa11938b50 100644
--- a/sys/kern/kern_mtxpool.c
+++ b/sys/kern/kern_mtxpool.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Matthew Dillon. All Rights Reserved.
*
diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c
index 9e318b27c250..23178731b899 100644
--- a/sys/kern/kern_osd.c
+++ b/sys/kern/kern_osd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_pmc.c b/sys/kern/kern_pmc.c
index 88e87f25cd2c..7c2022824dd0 100644
--- a/sys/kern/kern_pmc.c
+++ b/sys/kern/kern_pmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index fd1a30f0851f..fa17f745aa24 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Luigi Rizzo
*
diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c
index c1bd373bcb9e..1226ec80f81c 100644
--- a/sys/kern/kern_priv.c
+++ b/sys/kern/kern_priv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 nCircle Network Security, Inc.
* Copyright (c) 2009 Robert N. M. Watson
diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c
index 94624e88af51..c0d4bc0b1f3b 100644
--- a/sys/kern/kern_racct.c
+++ b/sys/kern/kern_racct.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/kern/kern_rangelock.c b/sys/kern/kern_rangelock.c
index 2983abbbdb5a..b6a20a72ca7d 100644
--- a/sys/kern/kern_rangelock.c
+++ b/sys/kern/kern_rangelock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c
index f4356f802f0c..0feb4b52dc7c 100644
--- a/sys/kern/kern_rctl.c
+++ b/sys/kern/kern_rctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index f1c18f952f24..628a850e0a6c 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/kern_sdt.c b/sys/kern/kern_sdt.c
index a46d21c1c548..954c2284bd03 100644
--- a/sys/kern/kern_sdt.c
+++ b/sys/kern/kern_sdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
*
diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c
index 62678f4faf64..be5973e6e117 100644
--- a/sys/kern/kern_sema.c
+++ b/sys/kern/kern_sema.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
*
diff --git a/sys/kern/kern_sharedpage.c b/sys/kern/kern_sharedpage.c
index 3aa5501eafdc..632980da40ef 100644
--- a/sys/kern/kern_sharedpage.c
+++ b/sys/kern/kern_sharedpage.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, 2012 Konstantin Belousov <kib@FreeBSD.org>
* Copyright (c) 2015 The FreeBSD Foundation
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index aec3b3d10e04..1cfad33352bf 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
index d8bdf4a17358..217c16cdfbe3 100644
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index fa1df225ee3b..7678efce3097 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 5da2735facb4..18c793457311 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index 846d3dafb5ac..40252cf3d80f 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Julian Elischer <julian@freebsd.org>.
* All rights reserved.
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index efe548a67bd1..9ddf04294369 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015, 2016 The FreeBSD Foundation
* Copyright (c) 2004, David Xu <davidxu@freebsd.org>
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 4dbadc732de9..043d2ac2f020 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 3c06c8c79108..bc17c4a4825b 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2000 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 689aeae86840..a37ad27c1491 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2000 Doug Rabson
* Copyright (c) 2004 Peter Wemm
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 4cde748ea9b7..094cdebc86f7 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2007, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_acl_nfs4.c b/sys/kern/subr_acl_nfs4.c
index 933dd3fdb35c..3fc9bb3df61d 100644
--- a/sys/kern/subr_acl_nfs4.c
+++ b/sys/kern/subr_acl_nfs4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Edward Tomasz Napierała <trasz@FreeBSD.org>
*
diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c
index 775957f9ef6f..38239d8c6e65 100644
--- a/sys/kern/subr_acl_posix1e.c
+++ b/sys/kern/subr_acl_posix1e.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2006 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/subr_atomic64.c b/sys/kern/subr_atomic64.c
index 5dffb161e8f2..e869074aec42 100644
--- a/sys/kern/subr_atomic64.c
+++ b/sys/kern/subr_atomic64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Justin Hibbits
*
diff --git a/sys/kern/subr_boot.c b/sys/kern/subr_boot.c
index 82dd4195edfd..1d1e4ea06b22 100644
--- a/sys/kern/subr_boot.c
+++ b/sys/kern/subr_boot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
* All Rights Reserved.
diff --git a/sys/kern/subr_bufring.c b/sys/kern/subr_bufring.c
index 490c7cfa2fb8..d0c6c0489c64 100644
--- a/sys/kern/subr_bufring.c
+++ b/sys/kern/subr_bufring.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 4512a9c83bb2..82e2bb707bd6 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997,1998,2003 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c
index a7ad30e77715..dece8dd8b987 100644
--- a/sys/kern/subr_bus_dma.c
+++ b/sys/kern/subr_bus_dma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 EMC Corp.
* All rights reserved.
diff --git a/sys/kern/subr_busdma_bufalloc.c b/sys/kern/subr_busdma_bufalloc.c
index fea141908399..c10e4b92718c 100644
--- a/sys/kern/subr_busdma_bufalloc.c
+++ b/sys/kern/subr_busdma_bufalloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ian Lepore
* All rights reserved.
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c
index 47a6f256fe7e..a159e7592866 100644
--- a/sys/kern/subr_capability.c
+++ b/sys/kern/subr_capability.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 FreeBSD Foundation
*
diff --git a/sys/kern/subr_compressor.c b/sys/kern/subr_compressor.c
index 74526a949437..753d6e94b398 100644
--- a/sys/kern/subr_compressor.c
+++ b/sys/kern/subr_compressor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014, 2017 Mark Johnston <markj@FreeBSD.org>
* Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
diff --git a/sys/kern/subr_counter.c b/sys/kern/subr_counter.c
index c79cc49dfd0d..05ce4780041c 100644
--- a/sys/kern/subr_counter.c
+++ b/sys/kern/subr_counter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/subr_coverage.c b/sys/kern/subr_coverage.c
index 9a719bcaecad..7736ccd52b53 100644
--- a/sys/kern/subr_coverage.c
+++ b/sys/kern/subr_coverage.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
* Copyright (C) 2018, 2019 Andrew Turner
diff --git a/sys/kern/subr_dummy_vdso_tc.c b/sys/kern/subr_dummy_vdso_tc.c
index d1ce053e0429..a9c64aa6457a 100644
--- a/sys/kern/subr_dummy_vdso_tc.c
+++ b/sys/kern/subr_dummy_vdso_tc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c
index 7d4457428bc8..c9d05a0770b8 100644
--- a/sys/kern/subr_epoch.c
+++ b/sys/kern/subr_epoch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index bd0f7ff30a18..a250a49adeae 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_fattime.c b/sys/kern/subr_fattime.c
index bc8bef4b089c..c5a18d40eee4 100644
--- a/sys/kern/subr_fattime.c
+++ b/sys/kern/subr_fattime.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c
index aafb2a2ba265..f15cd2c3f521 100644
--- a/sys/kern/subr_firmware.c
+++ b/sys/kern/subr_firmware.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008, Sam Leffler <sam@errno.com>
* All rights reserved.
diff --git a/sys/kern/subr_hints.c b/sys/kern/subr_hints.c
index b16761d7d6fc..10f300b5cf12 100644
--- a/sys/kern/subr_hints.c
+++ b/sys/kern/subr_hints.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 14a0205fc098..0384163f74ff 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 The FreeBSD Project
* All rights reserved.
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c
index d001450cba6f..fa6f56b49595 100644
--- a/sys/kern/subr_kobj.c
+++ b/sys/kern/subr_kobj.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2003 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c
index 36ba9125e176..0fc1784314cd 100644
--- a/sys/kern/subr_lock.c
+++ b/sys/kern/subr_lock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 1ada33c669dc..e68c10223d5d 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Michael Smith
* All rights reserved.
diff --git a/sys/kern/subr_msgbuf.c b/sys/kern/subr_msgbuf.c
index b41e78dd886e..d5a5436b590f 100644
--- a/sys/kern/subr_msgbuf.c
+++ b/sys/kern/subr_msgbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Ian Dowse. All rights reserved.
*
diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c
index e38dc45fa022..9db7dd2b68c6 100644
--- a/sys/kern/subr_pctrie.c
+++ b/sys/kern/subr_pctrie.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c
index 959394e06d4b..3017b8cb5774 100644
--- a/sys/kern/subr_physmem.c
+++ b/sys/kern/subr_physmem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_pidctrl.c b/sys/kern/subr_pidctrl.c
index 9d83c2d6b77d..bf33ce4babdb 100644
--- a/sys/kern/subr_pidctrl.c
+++ b/sys/kern/subr_pidctrl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c
index c6ab5ee39bd8..024892c62276 100644
--- a/sys/kern/subr_power.c
+++ b/sys/kern/subr_power.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/kern/subr_prng.c b/sys/kern/subr_prng.c
index 124a56e0e4ea..1f2bdaf58e2b 100644
--- a/sys/kern/subr_prng.c
+++ b/sys/kern/subr_prng.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c
index 3798b30e2240..c8af58c6f84f 100644
--- a/sys/kern/subr_rangeset.c
+++ b/sys/kern/subr_rangeset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 6c533f36c82e..eddb291684df 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2008 Poul-Henning Kamp
* Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index e81c6745aa24..081488859fc2 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index fafdc5b65cab..df9ec91dc931 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, John Baldwin <jhb@FreeBSD.org>.
*
diff --git a/sys/kern/subr_smr.c b/sys/kern/subr_smr.c
index df2520005673..70bafa2faada 100644
--- a/sys/kern/subr_smr.c
+++ b/sys/kern/subr_smr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019,2020 Jeffrey Roberson <jeff@FreeBSD.org>
*
diff --git a/sys/kern/subr_stack.c b/sys/kern/subr_stack.c
index cc10584f03a1..a30f858d38f1 100644
--- a/sys/kern/subr_stack.c
+++ b/sys/kern/subr_stack.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 7ad7c210ceff..16fe9ba9d41c 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c
index 6a7163b63d15..9d6549692ee2 100644
--- a/sys/kern/subr_terminal.c
+++ b/sys/kern/subr_terminal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 2be7a27064ad..6f026f552bfb 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c
index dfc9c3b9bf74..54665de36aa7 100644
--- a/sys/kern/subr_vmem.c
+++ b/sys/kern/subr_vmem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
* Copyright (c) 2013 EMC Corp.
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c
index 6f97b74a0a53..112a03378c0d 100644
--- a/sys/kern/sys_capability.c
+++ b/sys/kern/sys_capability.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2011 Robert N. M. Watson
* Copyright (c) 2010-2011 Jonathan Anderson
diff --git a/sys/kern/sys_eventfd.c b/sys/kern/sys_eventfd.c
index d4aab88ab09d..f4ccfcb8de0b 100644
--- a/sys/kern/sys_eventfd.c
+++ b/sys/kern/sys_eventfd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/kern/sys_getrandom.c b/sys/kern/sys_getrandom.c
index f58d0fe2af57..929a3ebe21af 100644
--- a/sys/kern/sys_getrandom.c
+++ b/sys/kern/sys_getrandom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c
index 95a389c582b0..52b326add9ad 100644
--- a/sys/kern/sys_procdesc.c
+++ b/sys/kern/sys_procdesc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2016 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 0facc9e63b32..3d6f1a461a9a 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -17,7 +17,7 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2005 McAfee, Inc.
* Copyright (c) 2016-2017 Robert N. M. Watson
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 5f5446d8a8d8..50ef9af289d4 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -6,7 +6,7 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2005 McAfee, Inc.
* Copyright (c) 2016-2017 Robert N. M. Watson
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index e1d6fda7e2a3..2a5ab859a4d6 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 8dfe5e93780f..f180870c81cd 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c
index 069da33ab26a..2153d2cbd71e 100644
--- a/sys/kern/tty_inq.c
+++ b/sys/kern/tty_inq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_outq.c b/sys/kern/tty_outq.c
index 70d6be3062b2..11cce96949a2 100644
--- a/sys/kern/tty_outq.c
+++ b/sys/kern/tty_outq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c
index eaf2f334ebc1..efe138e2eff7 100644
--- a/sys/kern/tty_pts.c
+++ b/sys/kern/tty_pts.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index c10dac907498..bc1b51a37eb2 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp. All rights reserved.
*
diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c
index 546b610010a3..420615b89335 100644
--- a/sys/kern/tty_ttydisc.c
+++ b/sys/kern/tty_ttydisc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 792c53c7baff..555ee7a7044a 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Paycounter, Inc.
* Copyright (c) 2005 Robert N. M. Watson
diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c
index 76620477fab5..16f6a04f4ade 100644
--- a/sys/kern/uipc_debug.c
+++ b/sys/kern/uipc_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 5c1775a261fc..d3cec556b7c0 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 2016-2017 Robert N. M. Watson
diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c
index db1d84696df0..1633be874327 100644
--- a/sys/kern/uipc_sem.c
+++ b/sys/kern/uipc_sem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* Copyright (c) 2003-2005 SPARTA, Inc.
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index f1dc0f828b23..e703268eb3f6 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, 2011, 2016-2017 Robert N. M. Watson
* Copyright 2020 The FreeBSD Foundation
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index dff1d9368f40..058d89c19a73 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2006, 2016-2017 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 90c49d4818b3..febe8092178c 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index cb94dbd81021..bbde345a1b89 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 1994,1997 John S. Dyson
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 43b000c78110..978d71c6f04f 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/kern/vfs_hash.c b/sys/kern/vfs_hash.c
index 2e446e69a314..02be4ba890ea 100644
--- a/sys/kern/vfs_hash.c
+++ b/sys/kern/vfs_hash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/kgssapi/gss_accept_sec_context.c b/sys/kgssapi/gss_accept_sec_context.c
index 6305de01126a..50dd1a5f1a79 100644
--- a/sys/kgssapi/gss_accept_sec_context.c
+++ b/sys/kgssapi/gss_accept_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_acquire_cred.c b/sys/kgssapi/gss_acquire_cred.c
index 3e53acec0249..0f4f7605e6b7 100644
--- a/sys/kgssapi/gss_acquire_cred.c
+++ b/sys/kgssapi/gss_acquire_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_add_oid_set_member.c b/sys/kgssapi/gss_add_oid_set_member.c
index 911f41c0f5fb..d946406b2deb 100644
--- a/sys/kgssapi/gss_add_oid_set_member.c
+++ b/sys/kgssapi/gss_add_oid_set_member.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_canonicalize_name.c b/sys/kgssapi/gss_canonicalize_name.c
index b1e2f9fe81b8..8cd280a3bef7 100644
--- a/sys/kgssapi/gss_canonicalize_name.c
+++ b/sys/kgssapi/gss_canonicalize_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_create_empty_oid_set.c b/sys/kgssapi/gss_create_empty_oid_set.c
index 74461397a5cd..789b1666fd52 100644
--- a/sys/kgssapi/gss_create_empty_oid_set.c
+++ b/sys/kgssapi/gss_create_empty_oid_set.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_delete_sec_context.c b/sys/kgssapi/gss_delete_sec_context.c
index 82f9e6b8f370..7a42261226ed 100644
--- a/sys/kgssapi/gss_delete_sec_context.c
+++ b/sys/kgssapi/gss_delete_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_display_status.c b/sys/kgssapi/gss_display_status.c
index 6809bc352b11..892adadcc59d 100644
--- a/sys/kgssapi/gss_display_status.c
+++ b/sys/kgssapi/gss_display_status.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_export_name.c b/sys/kgssapi/gss_export_name.c
index b769a6567855..3820303a54d5 100644
--- a/sys/kgssapi/gss_export_name.c
+++ b/sys/kgssapi/gss_export_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_get_mic.c b/sys/kgssapi/gss_get_mic.c
index f454daea9399..7e3811d6ac9a 100644
--- a/sys/kgssapi/gss_get_mic.c
+++ b/sys/kgssapi/gss_get_mic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_impl.c b/sys/kgssapi/gss_impl.c
index aa882d9f333b..e04036331e24 100644
--- a/sys/kgssapi/gss_impl.c
+++ b/sys/kgssapi/gss_impl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_import_name.c b/sys/kgssapi/gss_import_name.c
index 7200cc90354e..0587c9d953c8 100644
--- a/sys/kgssapi/gss_import_name.c
+++ b/sys/kgssapi/gss_import_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_init_sec_context.c b/sys/kgssapi/gss_init_sec_context.c
index a41c2a1d920f..3419d92ed652 100644
--- a/sys/kgssapi/gss_init_sec_context.c
+++ b/sys/kgssapi/gss_init_sec_context.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_names.c b/sys/kgssapi/gss_names.c
index 5672f049a3e3..859470639c94 100644
--- a/sys/kgssapi/gss_names.c
+++ b/sys/kgssapi/gss_names.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
diff --git a/sys/kgssapi/gss_pname_to_uid.c b/sys/kgssapi/gss_pname_to_uid.c
index 98e6f6584cec..9ae9fa808524 100644
--- a/sys/kgssapi/gss_pname_to_uid.c
+++ b/sys/kgssapi/gss_pname_to_uid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_release_buffer.c b/sys/kgssapi/gss_release_buffer.c
index 6082b22ae0b3..64233b4d5b30 100644
--- a/sys/kgssapi/gss_release_buffer.c
+++ b/sys/kgssapi/gss_release_buffer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_release_cred.c b/sys/kgssapi/gss_release_cred.c
index dfd4322a1a33..38e29105f0a5 100644
--- a/sys/kgssapi/gss_release_cred.c
+++ b/sys/kgssapi/gss_release_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_release_name.c b/sys/kgssapi/gss_release_name.c
index 4f7e8db5ae9f..929f53d5b386 100644
--- a/sys/kgssapi/gss_release_name.c
+++ b/sys/kgssapi/gss_release_name.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_release_oid_set.c b/sys/kgssapi/gss_release_oid_set.c
index a0d415ea47a4..ab2d026a05f3 100644
--- a/sys/kgssapi/gss_release_oid_set.c
+++ b/sys/kgssapi/gss_release_oid_set.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_set_cred_option.c b/sys/kgssapi/gss_set_cred_option.c
index 96e7112d9f31..e4d1902a86d7 100644
--- a/sys/kgssapi/gss_set_cred_option.c
+++ b/sys/kgssapi/gss_set_cred_option.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_test_oid_set_member.c b/sys/kgssapi/gss_test_oid_set_member.c
index 7c3b3c04282a..7072d32a0dc2 100644
--- a/sys/kgssapi/gss_test_oid_set_member.c
+++ b/sys/kgssapi/gss_test_oid_set_member.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_unwrap.c b/sys/kgssapi/gss_unwrap.c
index 7bcefd0f2493..d35073bbb1fa 100644
--- a/sys/kgssapi/gss_unwrap.c
+++ b/sys/kgssapi/gss_unwrap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_verify_mic.c b/sys/kgssapi/gss_verify_mic.c
index 45b8c18f2000..1fe887f355a4 100644
--- a/sys/kgssapi/gss_verify_mic.c
+++ b/sys/kgssapi/gss_verify_mic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_wrap.c b/sys/kgssapi/gss_wrap.c
index 4f78e2bf17ab..8f08850b7d2b 100644
--- a/sys/kgssapi/gss_wrap.c
+++ b/sys/kgssapi/gss_wrap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gss_wrap_size_limit.c b/sys/kgssapi/gss_wrap_size_limit.c
index 275f96757b24..ba0e86b5a5f6 100644
--- a/sys/kgssapi/gss_wrap_size_limit.c
+++ b/sys/kgssapi/gss_wrap_size_limit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gssapi_impl.h b/sys/kgssapi/gssapi_impl.h
index 21c77ec61d8c..90b44b357b46 100644
--- a/sys/kgssapi/gssapi_impl.h
+++ b/sys/kgssapi/gssapi_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gssd_prot.c b/sys/kgssapi/gssd_prot.c
index c5fe36fdf38c..a71947ff151e 100644
--- a/sys/kgssapi/gssd_prot.c
+++ b/sys/kgssapi/gssd_prot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/gsstest.c b/sys/kgssapi/gsstest.c
index 4a7710730e0d..46cfd03cb6bb 100644
--- a/sys/kgssapi/gsstest.c
+++ b/sys/kgssapi/gsstest.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/krb5/kcrypto.c b/sys/kgssapi/krb5/kcrypto.c
index dc5bc29c98e8..87e1f6a521ca 100644
--- a/sys/kgssapi/krb5/kcrypto.c
+++ b/sys/kgssapi/krb5/kcrypto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/krb5/kcrypto.h b/sys/kgssapi/krb5/kcrypto.h
index 62e28261187f..9b5a7e5f59ec 100644
--- a/sys/kgssapi/krb5/kcrypto.h
+++ b/sys/kgssapi/krb5/kcrypto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c
index 38faeb37066c..ef13365e4eb9 100644
--- a/sys/kgssapi/krb5/kcrypto_aes.c
+++ b/sys/kgssapi/krb5/kcrypto_aes.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/kgssapi/krb5/krb5_mech.c b/sys/kgssapi/krb5/krb5_mech.c
index bc8d9128bc32..01298149cd89 100644
--- a/sys/kgssapi/krb5/krb5_mech.c
+++ b/sys/kgssapi/krb5/krb5_mech.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/libkern/arm/aeabi_unwind.c b/sys/libkern/arm/aeabi_unwind.c
index 1b9bf0639d9a..778690b88cfd 100644
--- a/sys/libkern/arm/aeabi_unwind.c
+++ b/sys/libkern/arm/aeabi_unwind.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2013 Andrew Turner
* All rights reserved.
diff --git a/sys/libkern/arm/ldivmod_helper.c b/sys/libkern/arm/ldivmod_helper.c
index 65e2bf9d422d..ad7df7a61cb8 100644
--- a/sys/libkern/arm/ldivmod_helper.c
+++ b/sys/libkern/arm/ldivmod_helper.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 6fecb0a937c4..9b5202430562 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/libkern/iconv_ucs.c b/sys/libkern/iconv_ucs.c
index 30b0ee6f5a98..d0394fddf72d 100644
--- a/sys/libkern/iconv_ucs.c
+++ b/sys/libkern/iconv_ucs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2005 Ryuichiro Imura
* All rights reserved.
diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c
index 43bd5664305c..38e0ba65259c 100644
--- a/sys/libkern/iconv_xlat.c
+++ b/sys/libkern/iconv_xlat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/libkern/iconv_xlat16.c b/sys/libkern/iconv_xlat16.c
index c92a5c2453fc..4decccd5c57f 100644
--- a/sys/libkern/iconv_xlat16.c
+++ b/sys/libkern/iconv_xlat16.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2005 Ryuichiro Imura
* All rights reserved.
diff --git a/sys/libkern/inet_aton.c b/sys/libkern/inet_aton.c
index 0a51041d84ca..9cafe395b80b 100644
--- a/sys/libkern/inet_aton.c
+++ b/sys/libkern/inet_aton.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/libkern/memcchr.c b/sys/libkern/memcchr.c
index 526503ca5070..dc4a5176a63b 100644
--- a/sys/libkern/memcchr.c
+++ b/sys/libkern/memcchr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/libkern/memset.c b/sys/libkern/memset.c
index 431011a34500..1da7c07aaf6b 100644
--- a/sys/libkern/memset.c
+++ b/sys/libkern/memset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved.
*
diff --git a/sys/libkern/strchrnul.c b/sys/libkern/strchrnul.c
index d79a18fb34cc..cf18f1143228 100644
--- a/sys/libkern/strchrnul.c
+++ b/sys/libkern/strchrnul.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/libkern/strcspn.c b/sys/libkern/strcspn.c
index 62bfcf78eeb7..787fee3892e9 100644
--- a/sys/libkern/strcspn.c
+++ b/sys/libkern/strcspn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/sys/libkern/strdup.c b/sys/libkern/strdup.c
index 5d0661966cd3..72977b4bc98a 100644
--- a/sys/libkern/strdup.c
+++ b/sys/libkern/strdup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index a8c7964f69a3..213e088bacf0 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2010 Xin LI <delphij@FreeBSD.org>
*
diff --git a/sys/libkern/strnlen.c b/sys/libkern/strnlen.c
index d46a6c0746f6..6c3939ec8a94 100644
--- a/sys/libkern/strnlen.c
+++ b/sys/libkern/strnlen.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 David Schultz <das@FreeBSD.org>
* All rights reserved.
diff --git a/sys/libkern/strspn.c b/sys/libkern/strspn.c
index 7ee9016e3345..d688c6e1ee7d 100644
--- a/sys/libkern/strspn.c
+++ b/sys/libkern/strspn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
* All rights reserved.
diff --git a/sys/libkern/strvalid.c b/sys/libkern/strvalid.c
index 150e8016a224..c14307e6c5f1 100644
--- a/sys/libkern/strvalid.c
+++ b/sys/libkern/strvalid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index 47dd77de18d7..383c97b1a2ac 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/apbvar.h b/sys/mips/atheros/apbvar.h
index 5d7a1c5ad02d..9db64304dd21 100644
--- a/sys/mips/atheros/apbvar.h
+++ b/sys/mips/atheros/apbvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_bus_space_reversed.c b/sys/mips/atheros/ar71xx_bus_space_reversed.c
index f889de30773c..0c8aa9cc2849 100644
--- a/sys/mips/atheros/ar71xx_bus_space_reversed.c
+++ b/sys/mips/atheros/ar71xx_bus_space_reversed.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_bus_space_reversed.h b/sys/mips/atheros/ar71xx_bus_space_reversed.h
index cd23b7d61f03..24047673a0fa 100644
--- a/sys/mips/atheros/ar71xx_bus_space_reversed.h
+++ b/sys/mips/atheros/ar71xx_bus_space_reversed.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_chip.c b/sys/mips/atheros/ar71xx_chip.c
index b6975989f083..17eb902b404c 100644
--- a/sys/mips/atheros/ar71xx_chip.c
+++ b/sys/mips/atheros/ar71xx_chip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_chip.h b/sys/mips/atheros/ar71xx_chip.h
index 64f80a7fa9af..d6e57ffa7476 100644
--- a/sys/mips/atheros/ar71xx_chip.h
+++ b/sys/mips/atheros/ar71xx_chip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_cpudef.h b/sys/mips/atheros/ar71xx_cpudef.h
index a8028be51720..8e7549222c57 100644
--- a/sys/mips/atheros/ar71xx_cpudef.h
+++ b/sys/mips/atheros/ar71xx_cpudef.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c
index a8d93da531ba..afeefde89e6b 100644
--- a/sys/mips/atheros/ar71xx_ehci.c
+++ b/sys/mips/atheros/ar71xx_ehci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Sam Leffler. All rights reserved.
*
diff --git a/sys/mips/atheros/ar71xx_fixup.c b/sys/mips/atheros/ar71xx_fixup.c
index d8013b5888df..1f6afee2d860 100644
--- a/sys/mips/atheros/ar71xx_fixup.c
+++ b/sys/mips/atheros/ar71xx_fixup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_fixup.h b/sys/mips/atheros/ar71xx_fixup.h
index 8e4b4c1f6baa..31cc4353bd9e 100644
--- a/sys/mips/atheros/ar71xx_fixup.h
+++ b/sys/mips/atheros/ar71xx_fixup.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_gpio.c b/sys/mips/atheros/ar71xx_gpio.c
index 539e108cb798..b87c68f5ccc6 100644
--- a/sys/mips/atheros/ar71xx_gpio.c
+++ b/sys/mips/atheros/ar71xx_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
diff --git a/sys/mips/atheros/ar71xx_gpiovar.h b/sys/mips/atheros/ar71xx_gpiovar.h
index 35af376313f5..bc41cee18d38 100644
--- a/sys/mips/atheros/ar71xx_gpiovar.h
+++ b/sys/mips/atheros/ar71xx_gpiovar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
diff --git a/sys/mips/atheros/ar71xx_machdep.c b/sys/mips/atheros/ar71xx_machdep.c
index 2bb6d5845d16..f2bff86b3ec5 100644
--- a/sys/mips/atheros/ar71xx_machdep.c
+++ b/sys/mips/atheros/ar71xx_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_ohci.c b/sys/mips/atheros/ar71xx_ohci.c
index cb1601b019c4..c4165d017ef8 100644
--- a/sys/mips/atheros/ar71xx_ohci.c
+++ b/sys/mips/atheros/ar71xx_ohci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index 145bdc933e13..002e0ff99329 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_pci_bus_space.c b/sys/mips/atheros/ar71xx_pci_bus_space.c
index def31bd60dff..571f2f13a71e 100644
--- a/sys/mips/atheros/ar71xx_pci_bus_space.c
+++ b/sys/mips/atheros/ar71xx_pci_bus_space.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_pci_bus_space.h b/sys/mips/atheros/ar71xx_pci_bus_space.h
index 35de2fc22b04..98fe4c31aa64 100644
--- a/sys/mips/atheros/ar71xx_pci_bus_space.h
+++ b/sys/mips/atheros/ar71xx_pci_bus_space.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_setup.c b/sys/mips/atheros/ar71xx_setup.c
index 897f1360feaf..d2e1f1099518 100644
--- a/sys/mips/atheros/ar71xx_setup.c
+++ b/sys/mips/atheros/ar71xx_setup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_setup.h b/sys/mips/atheros/ar71xx_setup.h
index 3b6fd327d657..177b8ca7f44f 100644
--- a/sys/mips/atheros/ar71xx_setup.h
+++ b/sys/mips/atheros/ar71xx_setup.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c
index f851667dbf6b..cc4c3fa62d99 100644
--- a/sys/mips/atheros/ar71xx_spi.c
+++ b/sys/mips/atheros/ar71xx_spi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_wdog.c b/sys/mips/atheros/ar71xx_wdog.c
index 1d92b16ec5cf..fb7cac812eb4 100644
--- a/sys/mips/atheros/ar71xx_wdog.c
+++ b/sys/mips/atheros/ar71xx_wdog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar71xxreg.h b/sys/mips/atheros/ar71xxreg.h
index bddecbce5820..950071386a09 100644
--- a/sys/mips/atheros/ar71xxreg.h
+++ b/sys/mips/atheros/ar71xxreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/atheros/ar724x_chip.c b/sys/mips/atheros/ar724x_chip.c
index cbd831b4095b..8554825559e1 100644
--- a/sys/mips/atheros/ar724x_chip.c
+++ b/sys/mips/atheros/ar724x_chip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar724x_chip.h b/sys/mips/atheros/ar724x_chip.h
index 0ee95ab88f90..ab934d9fb385 100644
--- a/sys/mips/atheros/ar724x_chip.h
+++ b/sys/mips/atheros/ar724x_chip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index 74fb91a29d37..3377fd1d4cf8 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2011, Luiz Otavio O Souza.
diff --git a/sys/mips/atheros/ar724xreg.h b/sys/mips/atheros/ar724xreg.h
index 8e2e1329f8a8..3bbd70ad0af9 100644
--- a/sys/mips/atheros/ar724xreg.h
+++ b/sys/mips/atheros/ar724xreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar91xx_chip.c b/sys/mips/atheros/ar91xx_chip.c
index 216ef2b9c1be..d6d0f7790d1a 100644
--- a/sys/mips/atheros/ar91xx_chip.c
+++ b/sys/mips/atheros/ar91xx_chip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar91xx_chip.h b/sys/mips/atheros/ar91xx_chip.h
index e75f6cc406b3..e168dec157b5 100644
--- a/sys/mips/atheros/ar91xx_chip.h
+++ b/sys/mips/atheros/ar91xx_chip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar91xxreg.h b/sys/mips/atheros/ar91xxreg.h
index e4815e4034ab..22bbabc0e931 100644
--- a/sys/mips/atheros/ar91xxreg.h
+++ b/sys/mips/atheros/ar91xxreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
diff --git a/sys/mips/atheros/ar933x_chip.c b/sys/mips/atheros/ar933x_chip.c
index 73000a0220e1..9622ad0138f1 100644
--- a/sys/mips/atheros/ar933x_chip.c
+++ b/sys/mips/atheros/ar933x_chip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar933x_chip.h b/sys/mips/atheros/ar933x_chip.h
index 3b1545ab0e2d..891287502301 100644
--- a/sys/mips/atheros/ar933x_chip.h
+++ b/sys/mips/atheros/ar933x_chip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar933x_uart.h b/sys/mips/atheros/ar933x_uart.h
index 7cdf0ebc75ea..e5341daeb357 100644
--- a/sys/mips/atheros/ar933x_uart.h
+++ b/sys/mips/atheros/ar933x_uart.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar933xreg.h b/sys/mips/atheros/ar933xreg.h
index ffd778ab686d..b1bb3f455314 100644
--- a/sys/mips/atheros/ar933xreg.h
+++ b/sys/mips/atheros/ar933xreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar934x_chip.c b/sys/mips/atheros/ar934x_chip.c
index 0bd0547ecaca..59d062a7c8b2 100644
--- a/sys/mips/atheros/ar934x_chip.c
+++ b/sys/mips/atheros/ar934x_chip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar934x_chip.h b/sys/mips/atheros/ar934x_chip.h
index 1f9a792a235d..524f5b069cac 100644
--- a/sys/mips/atheros/ar934x_chip.h
+++ b/sys/mips/atheros/ar934x_chip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/ar934xreg.h b/sys/mips/atheros/ar934xreg.h
index e93d1f3ed4d0..f0628649ae49 100644
--- a/sys/mips/atheros/ar934xreg.h
+++ b/sys/mips/atheros/ar934xreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index df7f80135c12..c5d08ca0b5d8 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/atheros/if_argevar.h b/sys/mips/atheros/if_argevar.h
index 498a7f1695d1..b8476c0cff74 100644
--- a/sys/mips/atheros/if_argevar.h
+++ b/sys/mips/atheros/if_argevar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/atheros/pcf2123_rtc.c b/sys/mips/atheros/pcf2123_rtc.c
index 0717e3597091..904f344f308a 100644
--- a/sys/mips/atheros/pcf2123_rtc.c
+++ b/sys/mips/atheros/pcf2123_rtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/pcf2123reg.h b/sys/mips/atheros/pcf2123reg.h
index e3f84d4d5b74..d59c73d01526 100644
--- a/sys/mips/atheros/pcf2123reg.h
+++ b/sys/mips/atheros/pcf2123reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/uart_bus_ar71xx.c b/sys/mips/atheros/uart_bus_ar71xx.c
index 2c38a4dedbe1..18abeae8ad79 100644
--- a/sys/mips/atheros/uart_bus_ar71xx.c
+++ b/sys/mips/atheros/uart_bus_ar71xx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/uart_bus_ar933x.c b/sys/mips/atheros/uart_bus_ar933x.c
index 3f0314302600..2b6538a7c950 100644
--- a/sys/mips/atheros/uart_bus_ar933x.c
+++ b/sys/mips/atheros/uart_bus_ar933x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/uart_cpu_ar71xx.c b/sys/mips/atheros/uart_cpu_ar71xx.c
index 62d7dd69e80a..c4762f18d0f3 100644
--- a/sys/mips/atheros/uart_cpu_ar71xx.c
+++ b/sys/mips/atheros/uart_cpu_ar71xx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/atheros/uart_cpu_ar933x.c b/sys/mips/atheros/uart_cpu_ar933x.c
index 53879b5a5dca..5a65677e08ee 100644
--- a/sys/mips/atheros/uart_cpu_ar933x.c
+++ b/sys/mips/atheros/uart_cpu_ar933x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/uart_dev_ar933x.c b/sys/mips/atheros/uart_dev_ar933x.c
index e7e4626b9b98..fd124ebf866b 100644
--- a/sys/mips/atheros/uart_dev_ar933x.c
+++ b/sys/mips/atheros/uart_dev_ar933x.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/atheros/uart_dev_ar933x.h b/sys/mips/atheros/uart_dev_ar933x.h
index f6f8a4bdb61e..fc50c4c919bd 100644
--- a/sys/mips/atheros/uart_dev_ar933x.h
+++ b/sys/mips/atheros/uart_dev_ar933x.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/beri/beri_machdep.c b/sys/mips/beri/beri_machdep.c
index 754898f9a175..152a22e8ee1d 100644
--- a/sys/mips/beri/beri_machdep.c
+++ b/sys/mips/beri/beri_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* Copyright (c) 2012-2014 Robert N. M. Watson
diff --git a/sys/mips/beri/beri_pic.c b/sys/mips/beri/beri_pic.c
index ac8e98fd254f..49ca711da7f1 100644
--- a/sys/mips/beri/beri_pic.c
+++ b/sys/mips/beri/beri_pic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Ruslan Bukin <br@bsdpad.com>
* Copyright (c) 2013 SRI International
diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c
index 74dc7904dd50..6752726e1245 100644
--- a/sys/mips/cavium/ciu.c
+++ b/sys/mips/cavium/ciu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/if_octm.c b/sys/mips/cavium/if_octm.c
index f26596d83732..796dedbf0b34 100644
--- a/sys/mips/cavium/if_octm.c
+++ b/sys/mips/cavium/if_octm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.c b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
index d06b4a4571f5..6ff4072e920e 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.c
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.h b/sys/mips/cavium/octe/ethernet-mv88e61xx.h
index 7ea2368de7f4..1853198530cc 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.h
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/mv88e61xxphy.c b/sys/mips/cavium/octe/mv88e61xxphy.c
index ff03bb8f0e05..b1707f3e6969 100644
--- a/sys/mips/cavium/octe/mv88e61xxphy.c
+++ b/sys/mips/cavium/octe/mv88e61xxphy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/mv88e61xxphyreg.h b/sys/mips/cavium/octe/mv88e61xxphyreg.h
index 022e66242998..169250b2c77e 100644
--- a/sys/mips/cavium/octe/mv88e61xxphyreg.h
+++ b/sys/mips/cavium/octe/mv88e61xxphyreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/octe.c b/sys/mips/cavium/octe/octe.c
index 229b096b8f35..526978051c76 100644
--- a/sys/mips/cavium/octe/octe.c
+++ b/sys/mips/cavium/octe/octe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/octebus.c b/sys/mips/cavium/octe/octebus.c
index d344593ebeeb..3f0ff9aee327 100644
--- a/sys/mips/cavium/octe/octebus.c
+++ b/sys/mips/cavium/octe/octebus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octe/octebusvar.h b/sys/mips/cavium/octe/octebusvar.h
index 53f03e3fb824..aa88e9f46ffa 100644
--- a/sys/mips/cavium/octe/octebusvar.h
+++ b/sys/mips/cavium/octe/octebusvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_cop2.h b/sys/mips/cavium/octeon_cop2.h
index d7f852a13b3d..ccc06cb6d6bb 100644
--- a/sys/mips/cavium/octeon_cop2.h
+++ b/sys/mips/cavium/octeon_cop2.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_gpio.c b/sys/mips/cavium/octeon_gpio.c
index 65ce92b99e43..8f3fe241e509 100644
--- a/sys/mips/cavium/octeon_gpio.c
+++ b/sys/mips/cavium/octeon_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_gpiovar.h b/sys/mips/cavium/octeon_gpiovar.h
index 99a5c320b385..bda571077146 100644
--- a/sys/mips/cavium/octeon_gpiovar.h
+++ b/sys/mips/cavium/octeon_gpiovar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_machdep.c b/sys/mips/cavium/octeon_machdep.c
index 20817226cfd8..8c4459897a12 100644
--- a/sys/mips/cavium/octeon_machdep.c
+++ b/sys/mips/cavium/octeon_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_mp.c b/sys/mips/cavium/octeon_mp.c
index e18795ee9949..6fd20b274236 100644
--- a/sys/mips/cavium/octeon_mp.c
+++ b/sys/mips/cavium/octeon_mp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_pci_console.c b/sys/mips/cavium/octeon_pci_console.c
index bf7640e647df..68d0338e2500 100644
--- a/sys/mips/cavium/octeon_pci_console.c
+++ b/sys/mips/cavium/octeon_pci_console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_pmc.c b/sys/mips/cavium/octeon_pmc.c
index 23b5f0534f39..8e36d2443243 100644
--- a/sys/mips/cavium/octeon_pmc.c
+++ b/sys/mips/cavium/octeon_pmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c
index 95b8efa3f28e..d3a0c7cb5660 100644
--- a/sys/mips/cavium/octeon_rnd.c
+++ b/sys/mips/cavium/octeon_rnd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_rtc.c b/sys/mips/cavium/octeon_rtc.c
index 052694102f63..3e610fa63cd3 100644
--- a/sys/mips/cavium/octeon_rtc.c
+++ b/sys/mips/cavium/octeon_rtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octeon_wdog.c b/sys/mips/cavium/octeon_wdog.c
index 5ee390033796..b0380d0cf972 100644
--- a/sys/mips/cavium/octeon_wdog.c
+++ b/sys/mips/cavium/octeon_wdog.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2010-2011, Juli Mallett <jmallett@FreeBSD.org>
diff --git a/sys/mips/cavium/octopci.c b/sys/mips/cavium/octopci.c
index 570f1682cca4..9b4f3ea1cc33 100644
--- a/sys/mips/cavium/octopci.c
+++ b/sys/mips/cavium/octopci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/octopcivar.h b/sys/mips/cavium/octopcivar.h
index 35e3b13e5a62..49e2a8466ccb 100644
--- a/sys/mips/cavium/octopcivar.h
+++ b/sys/mips/cavium/octopcivar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/uart_bus_octeonusart.c b/sys/mips/cavium/uart_bus_octeonusart.c
index 8569f4fdc03d..dd5c3964fde2 100644
--- a/sys/mips/cavium/uart_bus_octeonusart.c
+++ b/sys/mips/cavium/uart_bus_octeonusart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/cavium/uart_cpu_octeonusart.c b/sys/mips/cavium/uart_cpu_octeonusart.c
index 5aca02becee0..f1e62a0b9c59 100644
--- a/sys/mips/cavium/uart_cpu_octeonusart.c
+++ b/sys/mips/cavium/uart_cpu_octeonusart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org> All rights reserved.
* Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/mips/cavium/uart_dev_oct16550.c b/sys/mips/cavium/uart_dev_oct16550.c
index c95706a907fc..937a526dac07 100644
--- a/sys/mips/cavium/uart_dev_oct16550.c
+++ b/sys/mips/cavium/uart_dev_oct16550.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/mips/cavium/usb/octusb.c b/sys/mips/cavium/usb/octusb.c
index 5c9d123facc5..25c7a820bdc9 100644
--- a/sys/mips/cavium/usb/octusb.c
+++ b/sys/mips/cavium/usb/octusb.c
@@ -2,7 +2,7 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/mips/cavium/usb/octusb.h b/sys/mips/cavium/usb/octusb.h
index 4844d03fdc1d..1eeae8d55c1d 100644
--- a/sys/mips/cavium/usb/octusb.h
+++ b/sys/mips/cavium/usb/octusb.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/mips/cavium/usb/octusb_octeon.c b/sys/mips/cavium/usb/octusb_octeon.c
index 41d02e6dcadf..7dc1d2a0b7ff 100644
--- a/sys/mips/cavium/usb/octusb_octeon.c
+++ b/sys/mips/cavium/usb/octusb_octeon.c
@@ -2,7 +2,7 @@
__FBSDID("$FreeBSD$");
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/sys/mips/include/_bus.h b/sys/mips/include/_bus.h
index 9edb1f183efc..8ab3c86fb027 100644
--- a/sys/mips/include/_bus.h
+++ b/sys/mips/include/_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/mips/include/atomic.h b/sys/mips/include/atomic.h
index ad8abf3498f1..5079eca6d93a 100644
--- a/sys/mips/include/atomic.h
+++ b/sys/mips/include/atomic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/mips/include/bus_dma.h b/sys/mips/include/bus_dma.h
index 7cc948549099..31f01e717f7a 100644
--- a/sys/mips/include/bus_dma.h
+++ b/sys/mips/include/bus_dma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Scott Long
* All rights reserved.
diff --git a/sys/mips/include/counter.h b/sys/mips/include/counter.h
index 0694a9c28cdb..8729e92f06c1 100644
--- a/sys/mips/include/counter.h
+++ b/sys/mips/include/counter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/cpufunc.h b/sys/mips/include/cpufunc.h
index a254fda2bb53..ace92c6226e1 100644
--- a/sys/mips/include/cpufunc.h
+++ b/sys/mips/include/cpufunc.h
@@ -1,7 +1,7 @@
/* $OpenBSD: pio.h,v 1.2 1998/09/15 10:50:12 pefo Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause
*
* Copyright (c) 2002-2004 Juli Mallett. All rights reserved.
*
diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h
index 976dedb29c96..62304cc4587a 100644
--- a/sys/mips/include/elf.h
+++ b/sys/mips/include/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2013 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/mips/include/fdt.h b/sys/mips/include/fdt.h
index 8da2a0c392f3..44eaad455055 100644
--- a/sys/mips/include/fdt.h
+++ b/sys/mips/include/fdt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/mips/include/gdb_machdep.h b/sys/mips/include/gdb_machdep.h
index e8ff620edc88..73a0ea109cf9 100644
--- a/sys/mips/include/gdb_machdep.h
+++ b/sys/mips/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/mips/include/hwfunc.h b/sys/mips/include/hwfunc.h
index 6d2112362fde..dfee6116f364 100644
--- a/sys/mips/include/hwfunc.h
+++ b/sys/mips/include/hwfunc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2004 Juli Mallett. All rights reserved.
*
diff --git a/sys/mips/include/intr_machdep.h b/sys/mips/include/intr_machdep.h
index 4dcc8818cd12..5b46b3c58138 100644
--- a/sys/mips/include/intr_machdep.h
+++ b/sys/mips/include/intr_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/kdb.h b/sys/mips/include/kdb.h
index 64e39e154f21..ea2854af4fa7 100644
--- a/sys/mips/include/kdb.h
+++ b/sys/mips/include/kdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/mips/include/memdev.h b/sys/mips/include/memdev.h
index 82e98150c11a..c1db8da16a6d 100644
--- a/sys/mips/include/memdev.h
+++ b/sys/mips/include/memdev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/mips/include/metadata.h b/sys/mips/include/metadata.h
index 620017260ae9..a4ec00cd0de7 100644
--- a/sys/mips/include/metadata.h
+++ b/sys/mips/include/metadata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/minidump.h b/sys/mips/include/minidump.h
index f9e7432b54d8..47b93b5ac4b7 100644
--- a/sys/mips/include/minidump.h
+++ b/sys/mips/include/minidump.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
diff --git a/sys/mips/include/octeon_cop2.h b/sys/mips/include/octeon_cop2.h
index 9bba74d591a3..e3cb5aa3b31f 100644
--- a/sys/mips/include/octeon_cop2.h
+++ b/sys/mips/include/octeon_cop2.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/ofw_machdep.h b/sys/mips/include/ofw_machdep.h
index 1f73f67f8c1c..8f2c723d9354 100644
--- a/sys/mips/include/ofw_machdep.h
+++ b/sys/mips/include/ofw_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/mips/include/pcpu.h b/sys/mips/include/pcpu.h
index fea594729e90..6859b5e0ad7c 100644
--- a/sys/mips/include/pcpu.h
+++ b/sys/mips/include/pcpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* Copyright (c) Peter Wemm <peter@netplex.com.au>
diff --git a/sys/mips/include/pcpu_aux.h b/sys/mips/include/pcpu_aux.h
index 3d4c70c491d6..192254f649c7 100644
--- a/sys/mips/include/pcpu_aux.h
+++ b/sys/mips/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/mips/include/pte.h b/sys/mips/include/pte.h
index 19d4ad341952..7a41808f65b0 100644
--- a/sys/mips/include/pte.h
+++ b/sys/mips/include/pte.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/runq.h b/sys/mips/include/runq.h
index d3207b3fa0f5..0dabbc2b683e 100644
--- a/sys/mips/include/runq.h
+++ b/sys/mips/include/runq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/sc_machdep.h b/sys/mips/include/sc_machdep.h
index 61a2a86f702d..ccd690899eb9 100644
--- a/sys/mips/include/sc_machdep.h
+++ b/sys/mips/include/sc_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/sys/mips/include/sf_buf.h b/sys/mips/include/sf_buf.h
index 27051674d1d2..23542dbb5acc 100644
--- a/sys/mips/include/sf_buf.h
+++ b/sys/mips/include/sf_buf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/mips/include/tlb.h b/sys/mips/include/tlb.h
index 24a18136175f..a7328298f168 100644
--- a/sys/mips/include/tlb.h
+++ b/sys/mips/include/tlb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/include/tls.h b/sys/mips/include/tls.h
index c209983027b1..824f48f006b8 100644
--- a/sys/mips/include/tls.h
+++ b/sys/mips/include/tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/include/vdso.h b/sys/mips/include/vdso.h
index b4771e68edff..ffaf0ea878a1 100644
--- a/sys/mips/include/vdso.h
+++ b/sys/mips/include/vdso.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/sys/mips/include/vm.h b/sys/mips/include/vm.h
index c759d8cfa61e..76554e2a6afa 100644
--- a/sys/mips/include/vm.h
+++ b/sys/mips/include/vm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c
index fb6b0f5b344f..9379ef2c67bc 100644
--- a/sys/mips/malta/gt.c
+++ b/sys/mips/malta/gt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
diff --git a/sys/mips/malta/gtvar.h b/sys/mips/malta/gtvar.h
index ac937fe6fd8b..4b9137e226a4 100644
--- a/sys/mips/malta/gtvar.h
+++ b/sys/mips/malta/gtvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
diff --git a/sys/mips/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c
index fd2b00355f89..69b542c09c9c 100644
--- a/sys/mips/malta/malta_machdep.c
+++ b/sys/mips/malta/malta_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/malta/uart_bus_maltausart.c b/sys/mips/malta/uart_bus_maltausart.c
index a3fdf77f879c..6de5c5ee1fd5 100644
--- a/sys/mips/malta/uart_bus_maltausart.c
+++ b/sys/mips/malta/uart_bus_maltausart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/malta/uart_cpu_maltausart.c b/sys/mips/malta/uart_cpu_maltausart.c
index be5edfd4e50c..4edd3b10c314 100644
--- a/sys/mips/malta/uart_cpu_maltausart.c
+++ b/sys/mips/malta/uart_cpu_maltausart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/malta/yamon.c b/sys/mips/malta/yamon.c
index d2a30f2a42fe..f61f7b4c23d5 100644
--- a/sys/mips/malta/yamon.c
+++ b/sys/mips/malta/yamon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2008 Bruce M. Simpson
* All rights reserved.
diff --git a/sys/mips/mips/busdma_machdep.c b/sys/mips/mips/busdma_machdep.c
index 04ede441b418..00e59ed012b2 100644
--- a/sys/mips/mips/busdma_machdep.c
+++ b/sys/mips/mips/busdma_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Oleksandr Tymoshenko
* All rights reserved.
diff --git a/sys/mips/mips/cpu.c b/sys/mips/mips/cpu.c
index 64450d24b6f3..4f8532a14515 100644
--- a/sys/mips/mips/cpu.c
+++ b/sys/mips/mips/cpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Juli Mallett. All rights reserved.
*
diff --git a/sys/mips/mips/db_trace.c b/sys/mips/mips/db_trace.c
index 4903b6d3d432..d38edbb42297 100644
--- a/sys/mips/mips/db_trace.c
+++ b/sys/mips/mips/db_trace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005, Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/mips/mips/dump_machdep.c b/sys/mips/mips/dump_machdep.c
index 2e8540118b95..3abfe821384f 100644
--- a/sys/mips/mips/dump_machdep.c
+++ b/sys/mips/mips/dump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/mips/mips/elf_machdep.c b/sys/mips/mips/elf_machdep.c
index 56d587a1c0fd..ca2c98181929 100644
--- a/sys/mips/mips/elf_machdep.c
+++ b/sys/mips/mips/elf_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/mips/mips/elf_trampoline.c b/sys/mips/mips/elf_trampoline.c
index dafd24bd4d25..6648a08378f8 100644
--- a/sys/mips/mips/elf_trampoline.c
+++ b/sys/mips/mips/elf_trampoline.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
diff --git a/sys/mips/mips/freebsd32_machdep.c b/sys/mips/mips/freebsd32_machdep.c
index 52dd3b87303b..15d69f7d4a93 100644
--- a/sys/mips/mips/freebsd32_machdep.c
+++ b/sys/mips/mips/freebsd32_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/mips/gdb_machdep.c b/sys/mips/mips/gdb_machdep.c
index 4b999613d7f6..f047901948af 100644
--- a/sys/mips/mips/gdb_machdep.c
+++ b/sys/mips/mips/gdb_machdep.c
@@ -1,7 +1,7 @@
/* $NetBSD: kgdb_machdep.c,v 1.11 2005/12/24 22:45:35 perry Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-NetBSD
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/mips/mips/intr_machdep.c b/sys/mips/mips/intr_machdep.c
index a36944f657ca..90f872b03e1f 100644
--- a/sys/mips/mips/intr_machdep.c
+++ b/sys/mips/mips/intr_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Oleksandr Tymoshenko
* Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
diff --git a/sys/mips/mips/libkern_machdep.c b/sys/mips/mips/libkern_machdep.c
index 2ff3608145e6..8ec016c82c97 100644
--- a/sys/mips/mips/libkern_machdep.c
+++ b/sys/mips/mips/libkern_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/mips/minidump_machdep.c b/sys/mips/mips/minidump_machdep.c
index 5fb1645c8586..f140edce7970 100644
--- a/sys/mips/mips/minidump_machdep.c
+++ b/sys/mips/mips/minidump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
diff --git a/sys/mips/mips/mp_machdep.c b/sys/mips/mips/mp_machdep.c
index dc089db1d189..09d6032b9ee9 100644
--- a/sys/mips/mips/mp_machdep.c
+++ b/sys/mips/mips/mp_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Neelkanth Natu
* All rights reserved.
diff --git a/sys/mips/mips/octeon_cop2.c b/sys/mips/mips/octeon_cop2.c
index 4d76643c618a..bcca6b5fb882 100644
--- a/sys/mips/mips/octeon_cop2.c
+++ b/sys/mips/mips/octeon_cop2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/mips/ptrace_machdep.c b/sys/mips/mips/ptrace_machdep.c
index 8de58d6cc236..71dd0088147e 100644
--- a/sys/mips/mips/ptrace_machdep.c
+++ b/sys/mips/mips/ptrace_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/mips/mips/sc_machdep.c b/sys/mips/mips/sc_machdep.c
index 4e2fd65bce14..00d1ba71e6ef 100644
--- a/sys/mips/mips/sc_machdep.c
+++ b/sys/mips/mips/sc_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/sys/mips/mips/stack_machdep.c b/sys/mips/mips/stack_machdep.c
index 3766f3e1cbd1..f4e96b2c0350 100644
--- a/sys/mips/mips/stack_machdep.c
+++ b/sys/mips/mips/stack_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
diff --git a/sys/mips/mips/stdatomic.c b/sys/mips/mips/stdatomic.c
index bd27f667f3ec..b3d05f3be6a8 100644
--- a/sys/mips/mips/stdatomic.c
+++ b/sys/mips/mips/stdatomic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c
index cdeb479e735b..4ef62c5561da 100644
--- a/sys/mips/mips/tick.c
+++ b/sys/mips/mips/tick.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2007 Bruce M. Simpson.
* Copyright (c) 2003-2004 Juli Mallett.
diff --git a/sys/mips/mips/tlb.c b/sys/mips/mips/tlb.c
index d2df51cb018c..039ef16c0914 100644
--- a/sys/mips/mips/tlb.c
+++ b/sys/mips/mips/tlb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
diff --git a/sys/mips/mips/uma_machdep.c b/sys/mips/mips/uma_machdep.c
index 321804d634d5..3bdb8f71171c 100644
--- a/sys/mips/mips/uma_machdep.c
+++ b/sys/mips/mips/uma_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/mips/nlm/board.c b/sys/mips/nlm/board.c
index 145676dd579a..dfdbf624f0a1 100644
--- a/sys/mips/nlm/board.c
+++ b/sys/mips/nlm/board.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/board.h b/sys/mips/nlm/board.h
index 17f9c04e33bf..e0815fef0e56 100644
--- a/sys/mips/nlm/board.h
+++ b/sys/mips/nlm/board.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/board_cpld.c b/sys/mips/nlm/board_cpld.c
index e1a3a2c18e14..524524ea8963 100644
--- a/sys/mips/nlm/board_cpld.c
+++ b/sys/mips/nlm/board_cpld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/board_eeprom.c b/sys/mips/nlm/board_eeprom.c
index d4fe1cbf3e33..ebdf82648c3a 100644
--- a/sys/mips/nlm/board_eeprom.c
+++ b/sys/mips/nlm/board_eeprom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/bus_space_rmi.c b/sys/mips/nlm/bus_space_rmi.c
index 6c194fc11ed7..b6d3e1ce8523 100644
--- a/sys/mips/nlm/bus_space_rmi.c
+++ b/sys/mips/nlm/bus_space_rmi.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/bus_space_rmi_pci.c b/sys/mips/nlm/bus_space_rmi_pci.c
index d98b0ba5d367..fd1eccbf521f 100644
--- a/sys/mips/nlm/bus_space_rmi_pci.c
+++ b/sys/mips/nlm/bus_space_rmi_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/clock.h b/sys/mips/nlm/clock.h
index b36823f97468..b117dfe19cc4 100644
--- a/sys/mips/nlm/clock.h
+++ b/sys/mips/nlm/clock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/cms.c b/sys/mips/nlm/cms.c
index 4b6ad7c95db4..b03354cf3c87 100644
--- a/sys/mips/nlm/cms.c
+++ b/sys/mips/nlm/cms.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/dev/net/mdio.c b/sys/mips/nlm/dev/net/mdio.c
index 7cf82248080a..0314b5881734 100644
--- a/sys/mips/nlm/dev/net/mdio.c
+++ b/sys/mips/nlm/dev/net/mdio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/nae.c b/sys/mips/nlm/dev/net/nae.c
index 0b55fe750f8a..1ae1f242bee8 100644
--- a/sys/mips/nlm/dev/net/nae.c
+++ b/sys/mips/nlm/dev/net/nae.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/sgmii.c b/sys/mips/nlm/dev/net/sgmii.c
index 8c51ddf08fe9..acbd92e2b6fc 100644
--- a/sys/mips/nlm/dev/net/sgmii.c
+++ b/sys/mips/nlm/dev/net/sgmii.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/ucore/ucore.h b/sys/mips/nlm/dev/net/ucore/ucore.h
index aa3512a2c12d..8350ede91d04 100644
--- a/sys/mips/nlm/dev/net/ucore/ucore.h
+++ b/sys/mips/nlm/dev/net/ucore/ucore.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/ucore/ucore_app.c b/sys/mips/nlm/dev/net/ucore/ucore_app.c
index 17e1e3e8b2c2..8e56f6573aed 100644
--- a/sys/mips/nlm/dev/net/ucore/ucore_app.c
+++ b/sys/mips/nlm/dev/net/ucore/ucore_app.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/xaui.c b/sys/mips/nlm/dev/net/xaui.c
index ac51c4cd2f44..2916bb2da467 100644
--- a/sys/mips/nlm/dev/net/xaui.c
+++ b/sys/mips/nlm/dev/net/xaui.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/xlpge.c b/sys/mips/nlm/dev/net/xlpge.c
index 20fe16048212..b9ab05882cd8 100644
--- a/sys/mips/nlm/dev/net/xlpge.c
+++ b/sys/mips/nlm/dev/net/xlpge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/net/xlpge.h b/sys/mips/nlm/dev/net/xlpge.h
index 5aabc68cae68..0ac276cf47dc 100644
--- a/sys/mips/nlm/dev/net/xlpge.h
+++ b/sys/mips/nlm/dev/net/xlpge.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/sec/nlmrsa.c b/sys/mips/nlm/dev/sec/nlmrsa.c
index 42b904d22a64..88bc1951b71b 100644
--- a/sys/mips/nlm/dev/sec/nlmrsa.c
+++ b/sys/mips/nlm/dev/sec/nlmrsa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/sec/nlmrsalib.h b/sys/mips/nlm/dev/sec/nlmrsalib.h
index 8166f0f0ded4..971f7c22ebf3 100644
--- a/sys/mips/nlm/dev/sec/nlmrsalib.h
+++ b/sys/mips/nlm/dev/sec/nlmrsalib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/sec/nlmsec.c b/sys/mips/nlm/dev/sec/nlmsec.c
index d5d83ba796bd..ad48138f7de0 100644
--- a/sys/mips/nlm/dev/sec/nlmsec.c
+++ b/sys/mips/nlm/dev/sec/nlmsec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/sec/nlmseclib.c b/sys/mips/nlm/dev/sec/nlmseclib.c
index 6e5e715c28f8..c9d185c23a0a 100644
--- a/sys/mips/nlm/dev/sec/nlmseclib.c
+++ b/sys/mips/nlm/dev/sec/nlmseclib.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/sec/nlmseclib.h b/sys/mips/nlm/dev/sec/nlmseclib.h
index 6f4d4d487e9d..4ba2d591ec91 100644
--- a/sys/mips/nlm/dev/sec/nlmseclib.h
+++ b/sys/mips/nlm/dev/sec/nlmseclib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/dev/sec/rsa_ucode.h b/sys/mips/nlm/dev/sec/rsa_ucode.h
index 057a2194d17c..2101503ed080 100644
--- a/sys/mips/nlm/dev/sec/rsa_ucode.h
+++ b/sys/mips/nlm/dev/sec/rsa_ucode.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/bridge.h b/sys/mips/nlm/hal/bridge.h
index 9374a7cdcfe7..72f6464c4732 100644
--- a/sys/mips/nlm/hal/bridge.h
+++ b/sys/mips/nlm/hal/bridge.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/cop2.h b/sys/mips/nlm/hal/cop2.h
index 80ec474a242f..2b817f70874c 100644
--- a/sys/mips/nlm/hal/cop2.h
+++ b/sys/mips/nlm/hal/cop2.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/cpucontrol.h b/sys/mips/nlm/hal/cpucontrol.h
index 501b80db5fac..465c71fe923d 100644
--- a/sys/mips/nlm/hal/cpucontrol.h
+++ b/sys/mips/nlm/hal/cpucontrol.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/fmn.c b/sys/mips/nlm/hal/fmn.c
index 5e568e2df08b..9ff87d2e99a4 100644
--- a/sys/mips/nlm/hal/fmn.c
+++ b/sys/mips/nlm/hal/fmn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/fmn.h b/sys/mips/nlm/hal/fmn.h
index 60548723b6ef..3e69fb98a535 100644
--- a/sys/mips/nlm/hal/fmn.h
+++ b/sys/mips/nlm/hal/fmn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/gbu.h b/sys/mips/nlm/hal/gbu.h
index adb67bbfd94c..056f58e206d1 100644
--- a/sys/mips/nlm/hal/gbu.h
+++ b/sys/mips/nlm/hal/gbu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/haldefs.h b/sys/mips/nlm/hal/haldefs.h
index 44890a165cc0..3628af3c02ca 100644
--- a/sys/mips/nlm/hal/haldefs.h
+++ b/sys/mips/nlm/hal/haldefs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/interlaken.h b/sys/mips/nlm/hal/interlaken.h
index b967b8b89054..7acfbab43aa2 100644
--- a/sys/mips/nlm/hal/interlaken.h
+++ b/sys/mips/nlm/hal/interlaken.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/iomap.h b/sys/mips/nlm/hal/iomap.h
index c5ebb68bffd2..0dd02cd39c42 100644
--- a/sys/mips/nlm/hal/iomap.h
+++ b/sys/mips/nlm/hal/iomap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/mdio.h b/sys/mips/nlm/hal/mdio.h
index c4f3e8cde6ca..d40d73f9eb26 100644
--- a/sys/mips/nlm/hal/mdio.h
+++ b/sys/mips/nlm/hal/mdio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/mips-extns.h b/sys/mips/nlm/hal/mips-extns.h
index 93c9db5d81cc..5b37465034f3 100644
--- a/sys/mips/nlm/hal/mips-extns.h
+++ b/sys/mips/nlm/hal/mips-extns.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/mmu.h b/sys/mips/nlm/hal/mmu.h
index 1173eb48a6b0..cf3969d39214 100644
--- a/sys/mips/nlm/hal/mmu.h
+++ b/sys/mips/nlm/hal/mmu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/nae.h b/sys/mips/nlm/hal/nae.h
index a2a3756947d7..57d85c6265be 100644
--- a/sys/mips/nlm/hal/nae.h
+++ b/sys/mips/nlm/hal/nae.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/nlm_hal.c b/sys/mips/nlm/hal/nlm_hal.c
index aa4bf5e00edd..48f199f950fb 100644
--- a/sys/mips/nlm/hal/nlm_hal.c
+++ b/sys/mips/nlm/hal/nlm_hal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/nlmsaelib.h b/sys/mips/nlm/hal/nlmsaelib.h
index 6e1451beeb27..ebf53f88dc27 100644
--- a/sys/mips/nlm/hal/nlmsaelib.h
+++ b/sys/mips/nlm/hal/nlmsaelib.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/pcibus.h b/sys/mips/nlm/hal/pcibus.h
index e6e0a3cdfa29..d22168fb37a4 100644
--- a/sys/mips/nlm/hal/pcibus.h
+++ b/sys/mips/nlm/hal/pcibus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/pic.h b/sys/mips/nlm/hal/pic.h
index c36e71383dba..05a267879727 100644
--- a/sys/mips/nlm/hal/pic.h
+++ b/sys/mips/nlm/hal/pic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/poe.h b/sys/mips/nlm/hal/poe.h
index 688d476cf838..e858c65c2136 100644
--- a/sys/mips/nlm/hal/poe.h
+++ b/sys/mips/nlm/hal/poe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/sgmii.h b/sys/mips/nlm/hal/sgmii.h
index 2059a40aa74d..2c222bd0c4a8 100644
--- a/sys/mips/nlm/hal/sgmii.h
+++ b/sys/mips/nlm/hal/sgmii.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/sys.h b/sys/mips/nlm/hal/sys.h
index 39fda2b9064a..7618b9c48988 100644
--- a/sys/mips/nlm/hal/sys.h
+++ b/sys/mips/nlm/hal/sys.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/uart.h b/sys/mips/nlm/hal/uart.h
index 4783ccd7d4ce..3e1d72e71a7f 100644
--- a/sys/mips/nlm/hal/uart.h
+++ b/sys/mips/nlm/hal/uart.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/ucore_loader.h b/sys/mips/nlm/hal/ucore_loader.h
index 95f2caf0bea8..b92b2229a1f5 100644
--- a/sys/mips/nlm/hal/ucore_loader.h
+++ b/sys/mips/nlm/hal/ucore_loader.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/hal/usb.h b/sys/mips/nlm/hal/usb.h
index 170d84232025..1e441ab20b09 100644
--- a/sys/mips/nlm/hal/usb.h
+++ b/sys/mips/nlm/hal/usb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/hal/xaui.h b/sys/mips/nlm/hal/xaui.h
index db422844711b..48347e9718a4 100644
--- a/sys/mips/nlm/hal/xaui.h
+++ b/sys/mips/nlm/hal/xaui.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/mips/nlm/interrupt.h b/sys/mips/nlm/interrupt.h
index ba502f3f7767..c15f878f1732 100644
--- a/sys/mips/nlm/interrupt.h
+++ b/sys/mips/nlm/interrupt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/intr_machdep.c b/sys/mips/nlm/intr_machdep.c
index 33bfad1fe882..caa119d73e81 100644
--- a/sys/mips/nlm/intr_machdep.c
+++ b/sys/mips/nlm/intr_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/msgring.h b/sys/mips/nlm/msgring.h
index deef2215209e..3aa6422f92e5 100644
--- a/sys/mips/nlm/msgring.h
+++ b/sys/mips/nlm/msgring.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c
index c80567b7187b..c1ca7e7f08f3 100644
--- a/sys/mips/nlm/tick.c
+++ b/sys/mips/nlm/tick.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/uart_cpu_xlp.c b/sys/mips/nlm/uart_cpu_xlp.c
index 773cf28a76ae..59a000408f63 100644
--- a/sys/mips/nlm/uart_cpu_xlp.c
+++ b/sys/mips/nlm/uart_cpu_xlp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/usb_init.c b/sys/mips/nlm/usb_init.c
index 4c389e9f88be..2d2f6fa9e152 100644
--- a/sys/mips/nlm/usb_init.c
+++ b/sys/mips/nlm/usb_init.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/xlp.h b/sys/mips/nlm/xlp.h
index 2ace3112fbe9..adee4805af0f 100644
--- a/sys/mips/nlm/xlp.h
+++ b/sys/mips/nlm/xlp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/xlp_machdep.c b/sys/mips/nlm/xlp_machdep.c
index 14022df2bd51..f2c6545898a1 100644
--- a/sys/mips/nlm/xlp_machdep.c
+++ b/sys/mips/nlm/xlp_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
* reserved.
diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c
index 7e71a334dcb2..54f721502b38 100644
--- a/sys/mips/nlm/xlp_pci.c
+++ b/sys/mips/nlm/xlp_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2012 Broadcom Corporation
* All Rights Reserved
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
index 7ac25b85d1cc..feab00599c92 100644
--- a/sys/modules/dtrace/dtraceall/dtraceall.c
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 John Birrell <jb@freebsd.org>
*
diff --git a/sys/net/bpf_buffer.h b/sys/net/bpf_buffer.h
index b49eed965b9c..0b0adb83ed7e 100644
--- a/sys/net/bpf_buffer.h
+++ b/sys/net/bpf_buffer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
diff --git a/sys/net/bpf_zerocopy.c b/sys/net/bpf_zerocopy.c
index d528237e1144..5b8a800b9f64 100644
--- a/sys/net/bpf_zerocopy.c
+++ b/sys/net/bpf_zerocopy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
diff --git a/sys/net/bpf_zerocopy.h b/sys/net/bpf_zerocopy.h
index c359874767a4..19b3f8568b84 100644
--- a/sys/net/bpf_zerocopy.h
+++ b/sys/net/bpf_zerocopy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
diff --git a/sys/net/debugnet.c b/sys/net/debugnet.c
index b41d93eca7fe..c463e33d618f 100644
--- a/sys/net/debugnet.c
+++ b/sys/net/debugnet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
* Copyright (c) 2005-2014 Sandvine Incorporated. All rights reserved.
diff --git a/sys/net/debugnet.h b/sys/net/debugnet.h
index ce7cba52fcb0..f470865d8d35 100644
--- a/sys/net/debugnet.h
+++ b/sys/net/debugnet.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
* Copyright (c) 2005-2014 Sandvine Incorporated
diff --git a/sys/net/debugnet_inet.c b/sys/net/debugnet_inet.c
index 837f838fa6d9..f6dfcb6af8ae 100644
--- a/sys/net/debugnet_inet.c
+++ b/sys/net/debugnet_inet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
* Copyright (c) 2005-2014 Sandvine Incorporated. All rights reserved.
diff --git a/sys/net/debugnet_int.h b/sys/net/debugnet_int.h
index 00a4e0c25c75..982000248374 100644
--- a/sys/net/debugnet_int.h
+++ b/sys/net/debugnet_int.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
*
diff --git a/sys/net/firewire.h b/sys/net/firewire.h
index dd7d23e49e73..0613301bdd66 100644
--- a/sys/net/firewire.h
+++ b/sys/net/firewire.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
diff --git a/sys/net/ieee_oui.h b/sys/net/ieee_oui.h
index 166021d3aa09..8ecb3d3a8a47 100644
--- a/sys/net/ieee_oui.h
+++ b/sys/net/ieee_oui.h
@@ -1,5 +1,5 @@
/* -
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/net/if_dead.c b/sys/net/if_dead.c
index b01d17fe9b1b..3149d63b0367 100644
--- a/sys/net/if_dead.c
+++ b/sys/net/if_dead.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/net/if_debug.c b/sys/net/if_debug.c
index 4a8e49e3dea6..53844d3ae0d2 100644
--- a/sys/net/if_debug.c
+++ b/sys/net/if_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index af1d16f11a18..e0caaaeae0ee 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 The FreeBSD Project.
* Copyright (c) 2015 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/net/if_enc.h b/sys/net/if_enc.h
index 758fff0ae99a..bf10dd20f852 100644
--- a/sys/net/if_enc.h
+++ b/sys/net/if_enc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 The FreeBSD Project.
* All rights reserved.
diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
index 662c601b3ad1..785cb64b70d8 100644
--- a/sys/net/if_epair.c
+++ b/sys/net/if_epair.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 The FreeBSD Foundation
* Copyright (c) 2009-2021 Bjoern A. Zeeb <bz@FreeBSD.org>
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 5ad452ac38e0..32e6bce3a4d0 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* Copyright (c) 2014, 2018 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index de3c59793ec7..7d2fc832da15 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c
index 9ada3af318f3..0ded30726d09 100644
--- a/sys/net/if_llatbl.c
+++ b/sys/net/if_llatbl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
diff --git a/sys/net/if_llatbl.h b/sys/net/if_llatbl.h
index 6af13660e344..571de13b7784 100644
--- a/sys/net/if_llatbl.h
+++ b/sys/net/if_llatbl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h
index e0b67ad95fcd..d0bd8947e309 100644
--- a/sys/net/if_pfsync.h
+++ b/sys/net/if_pfsync.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Michael Shalayeff
* All rights reserved.
diff --git a/sys/net/if_tap.h b/sys/net/if_tap.h
index 1c6f30d7730c..0c05a5ecaf30 100644
--- a/sys/net/if_tap.h
+++ b/sys/net/if_tap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c
index 668bbb217b8b..1bdf44a3181e 100644
--- a/sys/net/if_tuntap.c
+++ b/sys/net/if_tuntap.c
@@ -1,6 +1,6 @@
/* $NetBSD: if_tun.c,v 1.14 1994/06/29 06:36:25 cgd Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index 8527c165e4f5..9730fa869a12 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 479ba844ffef..0f9744e40a56 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
diff --git a/sys/net/netisr_internal.h b/sys/net/netisr_internal.h
index af486075d4b1..443b388d684a 100644
--- a/sys/net/netisr_internal.h
+++ b/sys/net/netisr_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
diff --git a/sys/net/netmap.h b/sys/net/netmap.h
index ce47de7fa884..fe8d465f73be 100644
--- a/sys/net/netmap.h
+++ b/sys/net/netmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
diff --git a/sys/net/netmap_legacy.h b/sys/net/netmap_legacy.h
index ba0ffa980285..e8504812d10f 100644
--- a/sys/net/netmap_legacy.h
+++ b/sys/net/netmap_legacy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
diff --git a/sys/net/netmap_user.h b/sys/net/netmap_user.h
index e8a8cf180e71..cc1f8198064b 100644
--- a/sys/net/netmap_user.h
+++ b/sys/net/netmap_user.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011-2016 Universita` di Pisa
* All rights reserved.
diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c
index 3c2ffa45afbb..ecf57c7ae736 100644
--- a/sys/net/route/fib_algo.c
+++ b/sys/net/route/fib_algo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhgrp.c b/sys/net/route/nhgrp.c
index de07eb76113f..6aca3b352433 100644
--- a/sys/net/route/nhgrp.c
+++ b/sys/net/route/nhgrp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhgrp_ctl.c b/sys/net/route/nhgrp_ctl.c
index b829b1125597..31c9eeda7b21 100644
--- a/sys/net/route/nhgrp_ctl.c
+++ b/sys/net/route/nhgrp_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhgrp_var.h b/sys/net/route/nhgrp_var.h
index c1540fbb33cf..479a37d60dfd 100644
--- a/sys/net/route/nhgrp_var.h
+++ b/sys/net/route/nhgrp_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhop.c b/sys/net/route/nhop.c
index 07bced3e8b11..eb7baa972587 100644
--- a/sys/net/route/nhop.c
+++ b/sys/net/route/nhop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhop.h b/sys/net/route/nhop.h
index f79cdb3459e9..d67d0aa04fd6 100644
--- a/sys/net/route/nhop.h
+++ b/sys/net/route/nhop.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c
index b92977ca42b0..e6a8907f8d2a 100644
--- a/sys/net/route/nhop_ctl.c
+++ b/sys/net/route/nhop_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhop_utils.c b/sys/net/route/nhop_utils.c
index df4fb4db66ca..c576f76ff29b 100644
--- a/sys/net/route/nhop_utils.c
+++ b/sys/net/route/nhop_utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhop_utils.h b/sys/net/route/nhop_utils.h
index 210b1387c5c9..5c29fcc031a5 100644
--- a/sys/net/route/nhop_utils.h
+++ b/sys/net/route/nhop_utils.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/nhop_var.h b/sys/net/route/nhop_var.h
index ace14556a14c..3f5fd661cc43 100644
--- a/sys/net/route/nhop_var.h
+++ b/sys/net/route/nhop_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c
index 9bb02c99ddce..5ecc8789fb77 100644
--- a/sys/net/route/route_ctl.c
+++ b/sys/net/route/route_ctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/route_ctl.h b/sys/net/route/route_ctl.h
index b65b64fcdaa0..5f74bf3c6785 100644
--- a/sys/net/route/route_ctl.h
+++ b/sys/net/route/route_ctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/route_ddb.c b/sys/net/route/route_ddb.c
index 437ede01b4a8..bbe5f07acaf4 100644
--- a/sys/net/route/route_ddb.c
+++ b/sys/net/route/route_ddb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/sys/net/route/route_helpers.c b/sys/net/route/route_helpers.c
index 465e0de81882..b0ded4edfa3f 100644
--- a/sys/net/route/route_helpers.c
+++ b/sys/net/route/route_helpers.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/route/route_rtentry.c b/sys/net/route/route_rtentry.c
index 7bf624f01540..1e50bc2dfcc5 100644
--- a/sys/net/route/route_rtentry.c
+++ b/sys/net/route/route_rtentry.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021-2022 Alexander V. Chernikov
*
diff --git a/sys/net/route/route_subscription.c b/sys/net/route/route_subscription.c
index 2c2b3e94e6b4..510b5117df1b 100644
--- a/sys/net/route/route_subscription.c
+++ b/sys/net/route/route_subscription.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021-2022 Alexander V. Chernikov
*
diff --git a/sys/net/route/route_temporal.c b/sys/net/route/route_temporal.c
index edb8ab769bbe..682267ffdb7f 100644
--- a/sys/net/route/route_temporal.c
+++ b/sys/net/route/route_temporal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/net/sff8472.h b/sys/net/sff8472.h
index 648fc5648e72..6c266e3c1c74 100644
--- a/sys/net/sff8472.h
+++ b/sys/net/sff8472.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 George V. Neville-Neil
* All rights reserved.
diff --git a/sys/net/vnet.c b/sys/net/vnet.c
index 057043808031..9656c3f97f65 100644
--- a/sys/net/vnet.c
+++ b/sys/net/vnet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2009 University of Zagreb
* Copyright (c) 2006-2009 FreeBSD Foundation
diff --git a/sys/net/vnet.h b/sys/net/vnet.h
index 813ba2da921b..1c624e26f53c 100644
--- a/sys/net/vnet.h
+++ b/sys/net/vnet.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2009 University of Zagreb
* Copyright (c) 2006-2009 FreeBSD Foundation
diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h
index 3444dfe0a7fa..0980d0753cb5 100644
--- a/sys/net80211/_ieee80211.h
+++ b/sys/net80211/_ieee80211.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 1034088c6fb6..17aac33c7126 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index 80106e73cce2..cdbd65947c8b 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_acl.c b/sys/net80211/ieee80211_acl.c
index 903a68b10caf..47cc90efd760 100644
--- a/sys/net80211/ieee80211_acl.c
+++ b/sys/net80211/ieee80211_acl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_action.c b/sys/net80211/ieee80211_action.c
index 0e917fb17a8e..043ce7f14ca4 100644
--- a/sys/net80211/ieee80211_action.c
+++ b/sys/net80211/ieee80211_action.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_action.h b/sys/net80211/ieee80211_action.h
index 71d2e7788444..5bf491596a0e 100644
--- a/sys/net80211/ieee80211_action.h
+++ b/sys/net80211/ieee80211_action.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index 1c1197e15bb3..c45693e006fb 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_adhoc.h b/sys/net80211/ieee80211_adhoc.h
index fa5d168d5b51..b7a918a4e449 100644
--- a/sys/net80211/ieee80211_adhoc.h
+++ b/sys/net80211/ieee80211_adhoc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ageq.c b/sys/net80211/ieee80211_ageq.c
index 8055012899f3..8887b6ee37bc 100644
--- a/sys/net80211/ieee80211_ageq.c
+++ b/sys/net80211/ieee80211_ageq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ageq.h b/sys/net80211/ieee80211_ageq.h
index 81bd17b6c944..0302df0b2b09 100644
--- a/sys/net80211/ieee80211_ageq.h
+++ b/sys/net80211/ieee80211_ageq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_alq.c b/sys/net80211/ieee80211_alq.c
index d7e6a78319db..0d49fd56a6e8 100644
--- a/sys/net80211/ieee80211_alq.c
+++ b/sys/net80211/ieee80211_alq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Lty Ltd
* All rights reserved.
diff --git a/sys/net80211/ieee80211_alq.h b/sys/net80211/ieee80211_alq.h
index d57e6e9b6838..4794904673c2 100644
--- a/sys/net80211/ieee80211_alq.h
+++ b/sys/net80211/ieee80211_alq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Adrian Chadd, Xenion Lty Ltd
* All rights reserved.
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index f5941392465b..9b093083768b 100644
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
index b732fe80bd18..368357c35fee 100644
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c
index a8ef3dab7635..5d942ede000a 100644
--- a/sys/net80211/ieee80211_crypto_ccmp.c
+++ b/sys/net80211/ieee80211_crypto_ccmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_crypto_none.c b/sys/net80211/ieee80211_crypto_none.c
index 062f398e207e..308abb1006a4 100644
--- a/sys/net80211/ieee80211_crypto_none.c
+++ b/sys/net80211/ieee80211_crypto_none.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 8e5431db9a60..c5355cc08875 100644
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c
index 113bb726a54b..da6bde5cea3f 100644
--- a/sys/net80211/ieee80211_crypto_wep.c
+++ b/sys/net80211/ieee80211_crypto_wep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c
index af4f8ea74799..6b4364e7eb3d 100644
--- a/sys/net80211/ieee80211_ddb.c
+++ b/sys/net80211/ieee80211_ddb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_dfs.c b/sys/net80211/ieee80211_dfs.c
index b3959220bfc9..f4bb5447392a 100644
--- a/sys/net80211/ieee80211_dfs.c
+++ b/sys/net80211/ieee80211_dfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_dfs.h b/sys/net80211/ieee80211_dfs.h
index 4bf580d7aa47..dc3bd4fa6c7d 100644
--- a/sys/net80211/ieee80211_dfs.h
+++ b/sys/net80211/ieee80211_dfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
index 5511791ae2aa..9bf70e6a600b 100644
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h
index 9d7b9cbb7cce..b609e4052b11 100644
--- a/sys/net80211/ieee80211_freebsd.h
+++ b/sys/net80211/ieee80211_freebsd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
index 00864fd23ed4..a16240927728 100644
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_hostap.h b/sys/net80211/ieee80211_hostap.h
index d3342eee96c5..26bda8f5955d 100644
--- a/sys/net80211/ieee80211_hostap.h
+++ b/sys/net80211/ieee80211_hostap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
index 2fbb5a10febf..17813f629245 100644
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ht.h b/sys/net80211/ieee80211_ht.h
index 7f62b0f7c756..d80138bc15f9 100644
--- a/sys/net80211/ieee80211_ht.h
+++ b/sys/net80211/ieee80211_ht.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c
index ad3de543664f..802dad288cd2 100644
--- a/sys/net80211/ieee80211_hwmp.c
+++ b/sys/net80211/ieee80211_hwmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 10e8f6e7e628..4efa9d4970fe 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_input.h b/sys/net80211/ieee80211_input.h
index 2192bba405d2..fd81c2af13b5 100644
--- a/sys/net80211/ieee80211_input.h
+++ b/sys/net80211/ieee80211_input.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 839f965f542f..fbfe918e5c11 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h
index 21c20c7a58d9..daeb8b54b13e 100644
--- a/sys/net80211/ieee80211_ioctl.h
+++ b/sys/net80211/ieee80211_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index 8da7d8490574..e0e1157ac148 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/net80211/ieee80211_mesh.h b/sys/net80211/ieee80211_mesh.h
index cff4adb1504d..e797420bd3ef 100644
--- a/sys/net80211/ieee80211_mesh.h
+++ b/sys/net80211/ieee80211_mesh.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/net80211/ieee80211_monitor.c b/sys/net80211/ieee80211_monitor.c
index bc390428768a..240ce67c513d 100644
--- a/sys/net80211/ieee80211_monitor.c
+++ b/sys/net80211/ieee80211_monitor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_monitor.h b/sys/net80211/ieee80211_monitor.h
index 0a64d0beb9a1..35d1c6c02cd8 100644
--- a/sys/net80211/ieee80211_monitor.h
+++ b/sys/net80211/ieee80211_monitor.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 341d77a48f5a..6d4adb88f481 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index 5782d513de08..fdebc6e6b9e2 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 48cdcbe4f773..61732c521829 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_phy.c b/sys/net80211/ieee80211_phy.c
index 8bf643b17307..8ad3f6f6608f 100644
--- a/sys/net80211/ieee80211_phy.c
+++ b/sys/net80211/ieee80211_phy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_phy.h b/sys/net80211/ieee80211_phy.h
index 45ff6c6b6b03..86635f3cbecf 100644
--- a/sys/net80211/ieee80211_phy.h
+++ b/sys/net80211/ieee80211_phy.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_power.c b/sys/net80211/ieee80211_power.c
index 4861d33e3688..dbb60e6c7b7c 100644
--- a/sys/net80211/ieee80211_power.c
+++ b/sys/net80211/ieee80211_power.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_power.h b/sys/net80211/ieee80211_power.h
index f2c0050f49e1..833b92039cab 100644
--- a/sys/net80211/ieee80211_power.h
+++ b/sys/net80211/ieee80211_power.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index b504f0fe98af..8dbc3a095000 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index e9b5157716d4..edc32aaefc74 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_radiotap.c b/sys/net80211/ieee80211_radiotap.c
index 08117a9e8c05..11b82c6f9d3f 100644
--- a/sys/net80211/ieee80211_radiotap.c
+++ b/sys/net80211/ieee80211_radiotap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ratectl.c b/sys/net80211/ieee80211_ratectl.c
index a1c3340c726c..d65688f80392 100644
--- a/sys/net80211/ieee80211_ratectl.c
+++ b/sys/net80211/ieee80211_ratectl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ratectl.h b/sys/net80211/ieee80211_ratectl.h
index 6890e74bf518..6a96275e9648 100644
--- a/sys/net80211/ieee80211_ratectl.h
+++ b/sys/net80211/ieee80211_ratectl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/net80211/ieee80211_ratectl_none.c b/sys/net80211/ieee80211_ratectl_none.c
index 7c1f847a0e0a..c6d17e5eec57 100644
--- a/sys/net80211/ieee80211_ratectl_none.c
+++ b/sys/net80211/ieee80211_ratectl_none.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Bernhard Schmidt <bschmidt@FreeBSD.org>
* All rights reserved.
diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c
index ec8416f02c8c..7bab1184201e 100644
--- a/sys/net80211/ieee80211_regdomain.c
+++ b/sys/net80211/ieee80211_regdomain.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_regdomain.h b/sys/net80211/ieee80211_regdomain.h
index e46ffa807618..d7d16a2ec9a7 100644
--- a/sys/net80211/ieee80211_regdomain.h
+++ b/sys/net80211/ieee80211_regdomain.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
index 1e5b6a3f0d14..68701a5fc78a 100644
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h
index 32330322ce33..dc309d626c37 100644
--- a/sys/net80211/ieee80211_scan.h
+++ b/sys/net80211/ieee80211_scan.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c
index 7ac959241358..a9ac0841a5ef 100644
--- a/sys/net80211/ieee80211_scan_sta.c
+++ b/sys/net80211/ieee80211_scan_sta.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
index b91350e39aee..adbe80b73a81 100644
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_sta.h b/sys/net80211/ieee80211_sta.h
index 5f953c7a4dd3..bcc9ee3d5017 100644
--- a/sys/net80211/ieee80211_sta.h
+++ b/sys/net80211/ieee80211_sta.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_superg.c b/sys/net80211/ieee80211_superg.c
index 5da97577165b..f53f4538f0d1 100644
--- a/sys/net80211/ieee80211_superg.c
+++ b/sys/net80211/ieee80211_superg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_superg.h b/sys/net80211/ieee80211_superg.h
index 4f77829fc25b..70453022047d 100644
--- a/sys/net80211/ieee80211_superg.h
+++ b/sys/net80211/ieee80211_superg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_tdma.c b/sys/net80211/ieee80211_tdma.c
index 361273a53664..2c3ce8a331bb 100644
--- a/sys/net80211/ieee80211_tdma.c
+++ b/sys/net80211/ieee80211_tdma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Intel Corporation
diff --git a/sys/net80211/ieee80211_tdma.h b/sys/net80211/ieee80211_tdma.h
index f0cbf5cdd77f..e057e6406850 100644
--- a/sys/net80211/ieee80211_tdma.h
+++ b/sys/net80211/ieee80211_tdma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* Copyright (c) 2007-2009 Intel Corporation
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index 7276f50685fb..4d54563400c9 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
index 1693e0a32102..479bb8235621 100644
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_wds.h b/sys/net80211/ieee80211_wds.h
index 23f1a571dce2..8c90cec15691 100644
--- a/sys/net80211/ieee80211_wds.h
+++ b/sys/net80211/ieee80211_wds.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/net80211/ieee80211_wps.h b/sys/net80211/ieee80211_wps.h
index 32cc667e9011..f14dc5cb5917 100644
--- a/sys/net80211/ieee80211_wps.h
+++ b/sys/net80211/ieee80211_wps.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 J.R. Oldroyd, Open Advisors Limited
* All rights reserved.
diff --git a/sys/net80211/ieee80211_xauth.c b/sys/net80211/ieee80211_xauth.c
index 5e7709514468..50e8d495a9b5 100644
--- a/sys/net80211/ieee80211_xauth.c
+++ b/sys/net80211/ieee80211_xauth.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Video54 Technologies, Inc.
* Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
index 1be23d4b708d..379ccf2b84fc 100644
--- a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
+++ b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2004
* Hartmut Brandt
diff --git a/sys/netgraph/atm/ng_sscfu.h b/sys/netgraph/atm/ng_sscfu.h
index 48cf93b43911..990a261b7ef1 100644
--- a/sys/netgraph/atm/ng_sscfu.h
+++ b/sys/netgraph/atm/ng_sscfu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/ng_sscop.h b/sys/netgraph/atm/ng_sscop.h
index cc67916ca49c..b4301c7aa75b 100644
--- a/sys/netgraph/atm/ng_sscop.h
+++ b/sys/netgraph/atm/ng_sscop.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/ng_uni.h b/sys/netgraph/atm/ng_uni.h
index 87e8cbe51677..3762990e0553 100644
--- a/sys/netgraph/atm/ng_uni.h
+++ b/sys/netgraph/atm/ng_uni.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c
index 0e2d1597d696..35b65212a446 100644
--- a/sys/netgraph/atm/ngatmbase.c
+++ b/sys/netgraph/atm/ngatmbase.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
index 4811f576df0b..ca868bc050d4 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ b/sys/netgraph/atm/sscfu/ng_sscfu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
index f97245833be1..000de1793f3a 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
+++ b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/sscop/ng_sscop_cust.h b/sys/netgraph/atm/sscop/ng_sscop_cust.h
index 97456a165220..5763ba2a0c07 100644
--- a/sys/netgraph/atm/sscop/ng_sscop_cust.h
+++ b/sys/netgraph/atm/sscop/ng_sscop_cust.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
index 1313bd062188..5721423b8a6e 100644
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ b/sys/netgraph/atm/uni/ng_uni.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/atm/uni/ng_uni_cust.h b/sys/netgraph/atm/uni/ng_uni_cust.h
index db0d04b95f81..b654bb489c8e 100644
--- a/sys/netgraph/atm/uni/ng_uni_cust.h
+++ b/sys/netgraph/atm/uni/ng_uni_cust.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
diff --git a/sys/netgraph/bluetooth/common/ng_bluetooth.c b/sys/netgraph/bluetooth/common/ng_bluetooth.c
index c191efae1e6b..e105452dd12d 100644
--- a/sys/netgraph/bluetooth/common/ng_bluetooth.c
+++ b/sys/netgraph/bluetooth/common/ng_bluetooth.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 11560b7c6681..cc9ee50cbe03 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
index 835fd65b9543..ab39f7f51e1d 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
index 2bfa3d6cde3c..7a9ba0036646 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 9250af43566e..06f881143885 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
index 978aeb924db6..d732dc388376 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, 2021 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index c2bd75c7faf0..504b92a2940d 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 60896597cae7..86c553fc8005 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
index cf192bfb3469..7d63ed4fb6c9 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
index 18f14c93ced3..32abaf476e3b 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
index fec039d1f1f6..a06e5ae0b9f5 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
index efc958d3be9e..c350696e3f74 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c
index 2d93a79cd679..1d46c7dc98a3 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index 707af8c84d06..1ce845ea215e 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.h b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
index dde5f883acb2..aa1b5174c668 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_prse.h b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
index 9731de6aa9fa..71c775005bb8 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_prse.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_prse.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
index a2804c44406b..a34c5e1d513e 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
index 16fdaa3ced63..24b386154dc6 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_var.h b/sys/netgraph/bluetooth/hci/ng_hci_var.h
index bb5c1f4624a7..b94502a1b305 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_var.h
+++ b/sys/netgraph/bluetooth/hci/ng_hci_var.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_bluetooth.h b/sys/netgraph/bluetooth/include/ng_bluetooth.h
index ae68392cc54c..11ccc4b002d3 100644
--- a/sys/netgraph/bluetooth/include/ng_bluetooth.h
+++ b/sys/netgraph/bluetooth/include/ng_bluetooth.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket.h b/sys/netgraph/bluetooth/include/ng_btsocket.h
index acaed2603ab7..8782ecd86494 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
index 5a51452dc884..cf2a0ed53c50 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
index 8ecb8821a275..630605c7dcf6 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
index 569a407ef629..cf4839e3cb20 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
index 979ea408f292..783e0fb8ebe8 100644
--- a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
+++ b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_h4.h b/sys/netgraph/bluetooth/include/ng_h4.h
index 872ce6423ad9..cc09c1b5cd64 100644
--- a/sys/netgraph/bluetooth/include/ng_h4.h
+++ b/sys/netgraph/bluetooth/include/ng_h4.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h
index 3de0ef337249..9c798f38d513 100644
--- a/sys/netgraph/bluetooth/include/ng_hci.h
+++ b/sys/netgraph/bluetooth/include/ng_hci.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h
index f7b5e54be59a..d79981295f8d 100644
--- a/sys/netgraph/bluetooth/include/ng_l2cap.h
+++ b/sys/netgraph/bluetooth/include/ng_l2cap.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/include/ng_ubt.h b/sys/netgraph/bluetooth/include/ng_ubt.h
index 9f713259d966..b91e0bd0a1dd 100644
--- a/sys/netgraph/bluetooth/include/ng_ubt.h
+++ b/sys/netgraph/bluetooth/include/ng_ubt.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
index a8a11b453223..c63482148dca 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
index 1d9b80b173a7..5e7375a82b3e 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
index b64c93c85eea..9d2f1f82661c 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
index 53c6ac3f7218..157d56af3553 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
index b1e7514430e0..1e67961ad376 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
index 36c118c2dd57..ddafac868d66 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
index 1a60e1be4a62..3e6c47dbc5de 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index 7a3daf75ead4..0d18ae6acb82 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index 4e29ec074788..61718f7750ae 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
index b60be9f5bc06..422308122ec6 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
index 098761b013eb..3232301bb614 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
index 2e60f6f8c675..8a2eb5a1d1c2 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
index 0bf8e8219e5a..bf06aa20c4c1 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c
index fc54154f1274..26e5987f8239 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index c82515f82631..036730d637c7 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index cd620fe3aef9..e1baf84a7179 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index 5508ff7526d2..1112d14b80fa 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 5659dc2ce742..41c01862b520 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
index 068b1890f27f..b9a84001eccb 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index 7933b4b10424..6717c2524533 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Alexander V. Chernikov <melifaro@ipfw.ru>
* Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
diff --git a/sys/netgraph/netflow/netflow.h b/sys/netgraph/netflow/netflow.h
index 894692bd4f90..ebc387a85c0d 100644
--- a/sys/netgraph/netflow/netflow.h
+++ b/sys/netgraph/netflow/netflow.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Alexander V. Chernikov <melifaro@ipfw.ru>
* Copyright (c) 2004 Gleb Smirnoff <glebius@FreeBSD.org>
diff --git a/sys/netgraph/netflow/netflow_v9.c b/sys/netgraph/netflow/netflow_v9.c
index 798bf6fecc42..8e0e1756c9b1 100644
--- a/sys/netgraph/netflow/netflow_v9.c
+++ b/sys/netgraph/netflow/netflow_v9.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander V. Chernikov <melifaro@ipfw.ru>
* All rights reserved.
diff --git a/sys/netgraph/netflow/netflow_v9.h b/sys/netgraph/netflow/netflow_v9.h
index 71bf893baccd..f799cc6a25f7 100644
--- a/sys/netgraph/netflow/netflow_v9.h
+++ b/sys/netgraph/netflow/netflow_v9.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Alexander V. Chernikov <melifaro@ipfw.ru>
* All rights reserved.
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c
index 187e18a3130e..a001597364cc 100644
--- a/sys/netgraph/netflow/ng_netflow.c
+++ b/sys/netgraph/netflow/ng_netflow.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Alexander V. Chernikov <melifaro@ipfw.ru>
* Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h
index 5086cff1c401..9fa77beb7cf7 100644
--- a/sys/netgraph/netflow/ng_netflow.h
+++ b/sys/netgraph/netflow/ng_netflow.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Alexander V. Chernikov <melifaro@ipfw.ru>
* Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c
index d4a13fb83128..aaa3726f9550 100644
--- a/sys/netgraph/ng_atmllc.c
+++ b/sys/netgraph/ng_atmllc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2004 Benno Rice <benno@eloquent.com.au>
* All Rights Reserved.
diff --git a/sys/netgraph/ng_atmllc.h b/sys/netgraph/ng_atmllc.h
index 5855c615069e..602914f554fc 100644
--- a/sys/netgraph/ng_atmllc.h
+++ b/sys/netgraph/ng_atmllc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2004 Benno Rice <benno@FreeBSD.org>
* All Rights Reserved.
diff --git a/sys/netgraph/ng_car.c b/sys/netgraph/ng_car.c
index ec61a3565ec9..44c870124785 100644
--- a/sys/netgraph/ng_car.c
+++ b/sys/netgraph/ng_car.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Nuno Antunes <nuno.antunes@gmail.com>
* Copyright (c) 2007 Alexander Motin <mav@freebsd.org>
diff --git a/sys/netgraph/ng_car.h b/sys/netgraph/ng_car.h
index 410161af29ee..26784e49453d 100644
--- a/sys/netgraph/ng_car.h
+++ b/sys/netgraph/ng_car.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Nuno Antunes <nuno.antunes@gmail.com>
* Copyright (c) 2007 Alexander Motin <mav@freebsd.org>
diff --git a/sys/netgraph/ng_deflate.c b/sys/netgraph/ng_deflate.c
index db9cc588b765..bb4692c57979 100644
--- a/sys/netgraph/ng_deflate.c
+++ b/sys/netgraph/ng_deflate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Alexander Motin <mav@alkar.net>
* All rights reserved.
diff --git a/sys/netgraph/ng_deflate.h b/sys/netgraph/ng_deflate.h
index 47d93d8f866c..1788c7c6738d 100644
--- a/sys/netgraph/ng_deflate.h
+++ b/sys/netgraph/ng_deflate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Alexander Motin <mav@alkar.net>
* All rights reserved.
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index 032867ee4bf6..ae6cf01f5895 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mark Santcroos <marks@ripe.net>
* Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
diff --git a/sys/netgraph/ng_device.h b/sys/netgraph/ng_device.h
index e8f8bfd62687..52efb2dce8d7 100644
--- a/sys/netgraph/ng_device.h
+++ b/sys/netgraph/ng_device.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mark Santcroos <marks@ripe.net>
*
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 5b12ecc70c11..52ff1a8e34f4 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
*
* Copyright (c) 1999-2001, Vitaly V Belekhov
diff --git a/sys/netgraph/ng_eiface.h b/sys/netgraph/ng_eiface.h
index 02dfc6cfcee8..859394ddb1b7 100644
--- a/sys/netgraph/ng_eiface.h
+++ b/sys/netgraph/ng_eiface.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001, Vitaly V Belekhov
* All rights reserved.
diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c
index 26e8489878b8..508d5357235b 100644
--- a/sys/netgraph/ng_etf.c
+++ b/sys/netgraph/ng_etf.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, FreeBSD Incorporated
* All rights reserved.
diff --git a/sys/netgraph/ng_etf.h b/sys/netgraph/ng_etf.h
index 885a4078f191..a767778d533c 100644
--- a/sys/netgraph/ng_etf.h
+++ b/sys/netgraph/ng_etf.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, FreeBSD Incorporated
* All rights reserved.
diff --git a/sys/netgraph/ng_hub.c b/sys/netgraph/ng_hub.c
index f1f9f2265854..c7bdfabfbf41 100644
--- a/sys/netgraph/ng_hub.c
+++ b/sys/netgraph/ng_hub.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Ruslan Ermilov
* All rights reserved.
diff --git a/sys/netgraph/ng_hub.h b/sys/netgraph/ng_hub.h
index a424035d9828..19c696c6915a 100644
--- a/sys/netgraph/ng_hub.h
+++ b/sys/netgraph/ng_hub.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Ruslan Ermilov
* All rights reserved.
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index d97f131849de..86eec190cc68 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2005, Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netgraph/ng_ipfw.h b/sys/netgraph/ng_ipfw.h
index 56ac09d99e72..1b85a1461d74 100644
--- a/sys/netgraph/ng_ipfw.h
+++ b/sys/netgraph/ng_ipfw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2005, Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netgraph/ng_macfilter.c b/sys/netgraph/ng_macfilter.c
index d09274f49c90..a8bb2a98a041 100644
--- a/sys/netgraph/ng_macfilter.c
+++ b/sys/netgraph/ng_macfilter.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Ericsson Research & Pekka Nikander
* Copyright (c) 2020 Nick Hibma <n_hibma@FreeBSD.org>
diff --git a/sys/netgraph/ng_macfilter.h b/sys/netgraph/ng_macfilter.h
index b6a01a2f4088..b908ba7e93d9 100644
--- a/sys/netgraph/ng_macfilter.h
+++ b/sys/netgraph/ng_macfilter.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Ericsson Research & Pekka Nikander
* Copyright (c) 2020 Nick Hibma <n_hibma@FreeBSD.org>
diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c
index cd3442914311..be7c3823a27a 100644
--- a/sys/netgraph/ng_nat.c
+++ b/sys/netgraph/ng_nat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2005, Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netgraph/ng_nat.h b/sys/netgraph/ng_nat.h
index b56d45c10671..79a40c075cdb 100644
--- a/sys/netgraph/ng_nat.h
+++ b/sys/netgraph/ng_nat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2005, Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netgraph/ng_patch.c b/sys/netgraph/ng_patch.c
index 3626cece7dc8..c83dddcac0cc 100644
--- a/sys/netgraph/ng_patch.c
+++ b/sys/netgraph/ng_patch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Maxim Ignatenko <gelraen.ua@gmail.com>
* Copyright (c) 2015 Dmitry Vagin <daemon.hammer@ya.ru>
diff --git a/sys/netgraph/ng_patch.h b/sys/netgraph/ng_patch.h
index fe2087b650aa..1cc56080e101 100644
--- a/sys/netgraph/ng_patch.h
+++ b/sys/netgraph/ng_patch.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Maxim Ignatenko <gelraen.ua@gmail.com>
* Copyright (c) 2015 Dmitry Vagin <daemon.hammer@ya.ru>
diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c
index 0812957b0109..dc0725a06c33 100644
--- a/sys/netgraph/ng_pipe.c
+++ b/sys/netgraph/ng_pipe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2010 University of Zagreb
* Copyright (c) 2007-2008 FreeBSD Foundation
diff --git a/sys/netgraph/ng_pipe.h b/sys/netgraph/ng_pipe.h
index 2abccaa0a19c..de56de5acfe0 100644
--- a/sys/netgraph/ng_pipe.h
+++ b/sys/netgraph/ng_pipe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2008 University of Zagreb
* Copyright (c) 2007-2008 FreeBSD Foundation
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index c9cb28fd9d04..e25cf1a5ba2a 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 1996-2000 Whistle Communications, Inc.
* All rights reserved.
diff --git a/sys/netgraph/ng_pred1.c b/sys/netgraph/ng_pred1.c
index 80f75992dd79..b88a442de7cf 100644
--- a/sys/netgraph/ng_pred1.c
+++ b/sys/netgraph/ng_pred1.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Alexander Motin <mav@alkar.net>
* All rights reserved.
diff --git a/sys/netgraph/ng_pred1.h b/sys/netgraph/ng_pred1.h
index 19687673851a..f35cc8b670ba 100644
--- a/sys/netgraph/ng_pred1.h
+++ b/sys/netgraph/ng_pred1.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Alexander Motin <mav@alkar.net>
* All rights reserved.
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index 9583ec71465e..b05697be4073 100644
--- a/sys/netgraph/ng_split.c
+++ b/sys/netgraph/ng_split.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2000, Vitaly V Belekhov
* All rights reserved.
diff --git a/sys/netgraph/ng_split.h b/sys/netgraph/ng_split.h
index d0d05e7c4eee..3414006e147c 100644
--- a/sys/netgraph/ng_split.h
+++ b/sys/netgraph/ng_split.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2000, Vitaly V Belekhov
* All rights reserved.
diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c
index d46c463fc53a..1f067aff5c12 100644
--- a/sys/netgraph/ng_tag.c
+++ b/sys/netgraph/ng_tag.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Vadim Goncharov <vadimnuclight@tpu.ru>
* All rights reserved.
diff --git a/sys/netgraph/ng_tag.h b/sys/netgraph/ng_tag.h
index 8400070708de..bcfb2dc4a48f 100644
--- a/sys/netgraph/ng_tag.h
+++ b/sys/netgraph/ng_tag.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Vadim Goncharov <vadimnuclight@tpu.ru>
* All rights reserved.
diff --git a/sys/netgraph/ng_tcpmss.c b/sys/netgraph/ng_tcpmss.c
index a79253309c39..77c30752712b 100644
--- a/sys/netgraph/ng_tcpmss.c
+++ b/sys/netgraph/ng_tcpmss.c
@@ -1,7 +1,7 @@
/*-
* ng_tcpmss.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, Alexey Popov <lollypop@flexuser.ru>
* All rights reserved.
diff --git a/sys/netgraph/ng_tcpmss.h b/sys/netgraph/ng_tcpmss.h
index f73e269d2040..0cd3b7f26c71 100644
--- a/sys/netgraph/ng_tcpmss.h
+++ b/sys/netgraph/ng_tcpmss.h
@@ -1,7 +1,7 @@
/*-
* ng_tcpmss.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, Alexey Popov <lollypop@flexuser.ru>
* All rights reserved.
diff --git a/sys/netgraph/ng_vlan.c b/sys/netgraph/ng_vlan.c
index ce70d4ec1e46..060f9438dd62 100644
--- a/sys/netgraph/ng_vlan.c
+++ b/sys/netgraph/ng_vlan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 IPNET Internet Communication Company
* Copyright (c) 2011 - 2012 Rozhuk Ivan <rozhuk.im@gmail.com>
diff --git a/sys/netgraph/ng_vlan.h b/sys/netgraph/ng_vlan.h
index fd7442e680c6..72579c434bb4 100644
--- a/sys/netgraph/ng_vlan.h
+++ b/sys/netgraph/ng_vlan.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 IPNET Internet Communication Company
* Copyright (c) 2011 - 2012 Rozhuk Ivan <rozhuk.im@gmail.com>
diff --git a/sys/netgraph/ng_vlan_rotate.c b/sys/netgraph/ng_vlan_rotate.c
index e6de782d9bb3..a9added7fb6d 100644
--- a/sys/netgraph/ng_vlan_rotate.c
+++ b/sys/netgraph/ng_vlan_rotate.c
@@ -1,5 +1,5 @@
/*-
- * Spdx-License-Identifier: BSD-2-Clause-FreeBSD
+ * Spdx-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019-2021 IKS Service GmbH
*
diff --git a/sys/netgraph/ng_vlan_rotate.h b/sys/netgraph/ng_vlan_rotate.h
index ef6dfd6b506a..79bd6b947656 100644
--- a/sys/netgraph/ng_vlan_rotate.h
+++ b/sys/netgraph/ng_vlan_rotate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019-2021 IKS Service GmbH
*
diff --git a/sys/netgraph/qos.h b/sys/netgraph/qos.h
index 0e5dfec479eb..4d74b3cd0ea1 100644
--- a/sys/netgraph/qos.h
+++ b/sys/netgraph/qos.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Lutz Donnerhacke <lutz@donnerhacke.de>
*
diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c
index 951507123c00..6c55a62dcf80 100644
--- a/sys/netinet/accf_data.c
+++ b/sys/netinet/accf_data.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet/accf_dns.c b/sys/netinet/accf_dns.c
index 854fc8a896ab..e1137103785d 100644
--- a/sys/netinet/accf_dns.c
+++ b/sys/netinet/accf_dns.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2007 David Malone <dwmalone@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c
index 85761c2502b3..485a99e250d3 100644
--- a/sys/netinet/accf_http.c
+++ b/sys/netinet/accf_http.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Paycounter, Inc.
* Author: Alfred Perlstein <alfred@paycounter.com>, <alfred@FreeBSD.org>
diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c
index 0d60b64dbe32..196c4ef4d31f 100644
--- a/sys/netinet/cc/cc.c
+++ b/sys/netinet/cc/cc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008
* Swinburne University of Technology, Melbourne, Australia.
diff --git a/sys/netinet/cc/cc_cdg.c b/sys/netinet/cc/cc_cdg.c
index 6287583f1f58..60eb49127a39 100644
--- a/sys/netinet/cc/cc_cdg.c
+++ b/sys/netinet/cc/cc_cdg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2013
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/cc/cc_chd.c b/sys/netinet/cc/cc_chd.c
index fc995b0ebb02..c982f766fd3c 100644
--- a/sys/netinet/cc/cc_chd.c
+++ b/sys/netinet/cc/cc_chd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c
index 210806c2f4f7..468bd55ac980 100644
--- a/sys/netinet/cc/cc_cubic.c
+++ b/sys/netinet/cc/cc_cubic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/netinet/cc/cc_cubic.h b/sys/netinet/cc/cc_cubic.h
index 13681aae793c..169e360e18d2 100644
--- a/sys/netinet/cc/cc_cubic.h
+++ b/sys/netinet/cc/cc_cubic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/netinet/cc/cc_hd.c b/sys/netinet/cc/cc_hd.c
index 128a823a6f2b..d90955480e37 100644
--- a/sys/netinet/cc/cc_hd.c
+++ b/sys/netinet/cc/cc_hd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c
index b5739142c9e5..f102a02d4f30 100644
--- a/sys/netinet/cc/cc_htcp.c
+++ b/sys/netinet/cc/cc_htcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/cc/cc_module.h b/sys/netinet/cc/cc_module.h
index 1daf915c1d36..2b99b133f6e2 100644
--- a/sys/netinet/cc/cc_module.h
+++ b/sys/netinet/cc/cc_module.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Lawrence Stewart <lstewart@freebsd.org>
* All rights reserved.
diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c
index 1ebd6200befd..bfe0d6e68e49 100644
--- a/sys/netinet/cc/cc_newreno.c
+++ b/sys/netinet/cc/cc_newreno.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995
* The Regents of the University of California.
diff --git a/sys/netinet/cc/cc_vegas.c b/sys/netinet/cc/cc_vegas.c
index a6946f82d21c..32c4454a277a 100644
--- a/sys/netinet/cc/cc_vegas.c
+++ b/sys/netinet/cc/cc_vegas.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/dccp.h b/sys/netinet/dccp.h
index de9472a33871..41038b9b4d2e 100644
--- a/sys/netinet/dccp.h
+++ b/sys/netinet/dccp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Tom Jones <thj@freebsd.org>
*
diff --git a/sys/netinet/in_debug.c b/sys/netinet/in_debug.c
index d39c528dd9cd..5d266045dbeb 100644
--- a/sys/netinet/in_debug.c
+++ b/sys/netinet/in_debug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet/in_fib_algo.c b/sys/netinet/in_fib_algo.c
index fd817a3fedf0..f613f4d544ff 100644
--- a/sys/netinet/in_fib_algo.c
+++ b/sys/netinet/in_fib_algo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c
index 47771187fd6d..8df6e8bc65ab 100644
--- a/sys/netinet/in_fib_dxr.c
+++ b/sys/netinet/in_fib_dxr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2022 Marko Zec
* Copyright (c) 2005, 2018 University of Zagreb
diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c
index a7314a27dbac..91f590a93467 100644
--- a/sys/netinet/in_kdtrace.c
+++ b/sys/netinet/in_kdtrace.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Mark Johnston <markj@FreeBSD.org>
*
diff --git a/sys/netinet/in_kdtrace.h b/sys/netinet/in_kdtrace.h
index ff0430db2faf..fd159c300543 100644
--- a/sys/netinet/in_kdtrace.h
+++ b/sys/netinet/in_kdtrace.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Mark Johnston <markj@FreeBSD.org>
*
diff --git a/sys/netinet/in_pcbgroup.c b/sys/netinet/in_pcbgroup.c
index 11ed75be1198..c48046b2acbc 100644
--- a/sys/netinet/in_pcbgroup.c
+++ b/sys/netinet/in_pcbgroup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index b6326b14c802..e3c77c8a90bb 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Michael Shalayeff.
* Copyright (c) 2003 Ryan McBride.
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 533dc5ccd85f..a4a3256d542b 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2010 Luigi Rizzo, Universita` di Pisa
* Portions Copyright (c) 2000 Akamba Corp.
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index cbf03a5a6f8e..43f07c55f06e 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
*
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index b52f5403b332..1f65a674c4f8 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Michael J. Silbersack.
* All rights reserved.
diff --git a/sys/netinet/khelp/h_ertt.c b/sys/netinet/khelp/h_ertt.c
index 541319285b35..8269e238e975 100644
--- a/sys/netinet/khelp/h_ertt.c
+++ b/sys/netinet/khelp/h_ertt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/khelp/h_ertt.h b/sys/netinet/khelp/h_ertt.h
index eb526057060f..a4064ca5ba22 100644
--- a/sys/netinet/khelp/h_ertt.h
+++ b/sys/netinet/khelp/h_ertt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010
* Swinburne University of Technology, Melbourne, Australia
diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c
index 37f5bd5a1db1..b43fa93757e7 100644
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias.h b/sys/netinet/libalias/alias.h
index 558a750b4fd8..1ba24f9211dd 100644
--- a/sys/netinet/libalias/alias.h
+++ b/sys/netinet/libalias/alias.h
@@ -1,7 +1,7 @@
/* lint -save -library Flexelint comment for external headers */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index ed222c4133d4..d0ff385214ba 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_db.h b/sys/netinet/libalias/alias_db.h
index 971ca305c1a6..35858099bce2 100644
--- a/sys/netinet/libalias/alias_db.h
+++ b/sys/netinet/libalias/alias_db.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_dummy.c b/sys/netinet/libalias/alias_dummy.c
index a88f50aada57..7871003474c5 100644
--- a/sys/netinet/libalias/alias_dummy.c
+++ b/sys/netinet/libalias/alias_dummy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Paolo Pisati <piso@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c
index b2fcfbf2396b..77577500520e 100644
--- a/sys/netinet/libalias/alias_ftp.c
+++ b/sys/netinet/libalias/alias_ftp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c
index 524b70b0632c..4732d6c433d1 100644
--- a/sys/netinet/libalias/alias_irc.c
+++ b/sys/netinet/libalias/alias_irc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_local.h b/sys/netinet/libalias/alias_local.h
index 938744924dcc..15b0c0aa842a 100644
--- a/sys/netinet/libalias/alias_local.h
+++ b/sys/netinet/libalias/alias_local.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_mod.c b/sys/netinet/libalias/alias_mod.c
index dba9a0553af5..dfcb8c778735 100644
--- a/sys/netinet/libalias/alias_mod.c
+++ b/sys/netinet/libalias/alias_mod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Paolo Pisati <piso@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_mod.h b/sys/netinet/libalias/alias_mod.h
index 781366b14ef6..5b7d13c7e72f 100644
--- a/sys/netinet/libalias/alias_mod.h
+++ b/sys/netinet/libalias/alias_mod.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Paolo Pisati <piso@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index ab4bd818e1a5..6025aa2f3f27 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Written by Atsushi Murai <amurai@spec.co.jp>
* Copyright (c) 1998, System Planning and Engineering Co.
diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c
index 7efab1fdc8db..d4df7e86c542 100644
--- a/sys/netinet/libalias/alias_proxy.c
+++ b/sys/netinet/libalias/alias_proxy.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c
index 41d1d5337a85..b0bda8cba795 100644
--- a/sys/netinet/libalias/alias_sctp.c
+++ b/sys/netinet/libalias/alias_sctp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008
* Swinburne University of Technology, Melbourne, Australia.
diff --git a/sys/netinet/libalias/alias_sctp.h b/sys/netinet/libalias/alias_sctp.h
index de1090cedd84..f88d1d4bf753 100644
--- a/sys/netinet/libalias/alias_sctp.h
+++ b/sys/netinet/libalias/alias_sctp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008
* Swinburne University of Technology, Melbourne, Australia.
diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c
index 2c664c2c58d9..2d9676944344 100644
--- a/sys/netinet/libalias/alias_skinny.c
+++ b/sys/netinet/libalias/alias_skinny.c
@@ -1,7 +1,7 @@
/*-
* alias_skinny.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 MarcusCom, Inc.
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c
index c09c8e0c6d77..e7a15afebc6d 100644
--- a/sys/netinet/libalias/alias_smedia.c
+++ b/sys/netinet/libalias/alias_smedia.c
@@ -1,7 +1,7 @@
/*-
* alias_smedia.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2000 Whistle Communications, Inc.
* All rights reserved.
diff --git a/sys/netinet/libalias/alias_util.c b/sys/netinet/libalias/alias_util.c
index 85566e0b2d4f..cff33b4488f0 100644
--- a/sys/netinet/libalias/alias_util.c
+++ b/sys/netinet/libalias/alias_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* All rights reserved.
diff --git a/sys/netinet/sctp_module.c b/sys/netinet/sctp_module.c
index 50b09eb6f930..c81b6b182824 100644
--- a/sys/netinet/sctp_module.c
+++ b/sys/netinet/sctp_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019-2020 The FreeBSD Foundation
*
diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c
index 465a2bc7de5c..69cd49617d05 100644
--- a/sys/netinet/sctp_ss_functions.c
+++ b/sys/netinet/sctp_ss_functions.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2012, by Michael Tuexen. All rights reserved.
* Copyright (c) 2010-2012, by Randall Stewart. All rights reserved.
diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c
index 2a6bf5e71151..d9105f783598 100644
--- a/sys/netinet/siftr.c
+++ b/sys/netinet/siftr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009
* Swinburne University of Technology, Melbourne, Australia.
diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c
index c2c84efb7d58..06ab6372b26e 100644
--- a/sys/netinet/tcp_log_buf.c
+++ b/sys/netinet/tcp_log_buf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018 Netflix, Inc.
*
diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h
index 4e8b79babfe8..1694cdb7e898 100644
--- a/sys/netinet/tcp_log_buf.h
+++ b/sys/netinet/tcp_log_buf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2018 Netflix, Inc.
*
diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c
index ec7065ae306f..fa5e11320b47 100644
--- a/sys/netinet/tcp_lro.c
+++ b/sys/netinet/tcp_lro.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, Myricom Inc.
* Copyright (c) 2008, Intel Corporation.
diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h
index 82cf1af218d6..2b0555027266 100644
--- a/sys/netinet/tcp_lro.h
+++ b/sys/netinet/tcp_lro.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, Myricom Inc.
* Copyright (c) 2008, Intel Corporation.
diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c
index ba190f0303f1..d239004931d0 100644
--- a/sys/netinet/tcp_offload.c
+++ b/sys/netinet/tcp_offload.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/netinet/tcp_offload.h b/sys/netinet/tcp_offload.h
index 19c120ccdd7d..da698b437c70 100644
--- a/sys/netinet/tcp_offload.h
+++ b/sys/netinet/tcp_offload.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 2282373a2c1d..b3c2fbeb927e 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 McAfee, Inc.
* Copyright (c) 2006,2013 Andre Oppermann, Internet Business Solutions AG
diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c
index fbe2658551d8..611055199546 100644
--- a/sys/netinet/toecore.c
+++ b/sys/netinet/toecore.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/netinet/toecore.h b/sys/netinet/toecore.h
index 36493abf7149..b23d3b4141d3 100644
--- a/sys/netinet/toecore.h
+++ b/sys/netinet/toecore.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/sys/netinet6/in6_fib_algo.c b/sys/netinet6/in6_fib_algo.c
index 04d194273168..db3058a50be4 100644
--- a/sys/netinet6/in6_fib_algo.c
+++ b/sys/netinet6/in6_fib_algo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/netinet6/in6_pcbgroup.c b/sys/netinet6/in6_pcbgroup.c
index b9ea1f27fa1c..7982c1edc646 100644
--- a/sys/netinet6/in6_pcbgroup.c
+++ b/sys/netinet6/in6_pcbgroup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/netinet6/ip_fw_nat64.h b/sys/netinet6/ip_fw_nat64.h
index 40e3441132e1..2894ee3cce30 100644
--- a/sys/netinet6/ip_fw_nat64.h
+++ b/sys/netinet6/ip_fw_nat64.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netinet6/send.c b/sys/netinet6/send.c
index a69afd7b5ed6..4ecc47244e0d 100644
--- a/sys/netinet6/send.c
+++ b/sys/netinet6/send.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Ana Kukec <anchie@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netinet6/send.h b/sys/netinet6/send.h
index 6194f80e64d3..37568b027b57 100644
--- a/sys/netinet6/send.h
+++ b/sys/netinet6/send.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Ana Kukec <anchie@FreeBSD.org>
* All rights reserved.
diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c
index 75aa8cae5a31..cf050b4d20c2 100644
--- a/sys/netipsec/ipsec_mbuf.c
+++ b/sys/netipsec/ipsec_mbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 99855e7209de..db2f1286b5da 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
* Copyright (c) 2016 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netlink/netlink.h b/sys/netlink/netlink.h
index 3623ae754951..9e6beef96cc6 100644
--- a/sys/netlink/netlink.h
+++ b/sys/netlink/netlink.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h
index 8cd29cf56d10..787548bdb7c2 100644
--- a/sys/netlink/netlink_ctl.h
+++ b/sys/netlink/netlink_ctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
index 64e1469e0d33..eb09390fbc71 100644
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c
index d4022c2c2a75..13f99512244e 100644
--- a/sys/netlink/netlink_generic.c
+++ b/sys/netlink/netlink_generic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_generic.h b/sys/netlink/netlink_generic.h
index bd7a59f11059..fbd4ae785cbe 100644
--- a/sys/netlink/netlink_generic.h
+++ b/sys/netlink/netlink_generic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c
index 509065d04818..70d29625cc66 100644
--- a/sys/netlink/netlink_io.c
+++ b/sys/netlink/netlink_io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netlink/netlink_linux.h b/sys/netlink/netlink_linux.h
index 8841624be070..6dd2a964a64a 100644
--- a/sys/netlink/netlink_linux.h
+++ b/sys/netlink/netlink_linux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c
index e30138266d9d..fd235230cd28 100644
--- a/sys/netlink/netlink_message_parser.c
+++ b/sys/netlink/netlink_message_parser.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h
index 083c93dcbf8d..7b5fde49a07c 100644
--- a/sys/netlink/netlink_message_parser.h
+++ b/sys/netlink/netlink_message_parser.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c
index 8a9315eedd1b..cb50cc9d9dc6 100644
--- a/sys/netlink/netlink_message_writer.c
+++ b/sys/netlink/netlink_message_writer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_message_writer.h b/sys/netlink/netlink_message_writer.h
index 13acf5add559..750d13e8d5b8 100644
--- a/sys/netlink/netlink_message_writer.h
+++ b/sys/netlink/netlink_message_writer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c
index f820796a6028..3f66478ced3b 100644
--- a/sys/netlink/netlink_module.c
+++ b/sys/netlink/netlink_module.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c
index 037fd2170c66..47a67ccd5793 100644
--- a/sys/netlink/netlink_route.c
+++ b/sys/netlink/netlink_route.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_route.h b/sys/netlink/netlink_route.h
index 93445f2e1699..0c328d941bd5 100644
--- a/sys/netlink/netlink_route.h
+++ b/sys/netlink/netlink_route.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h
index 935012885362..78d0f75333e3 100644
--- a/sys/netlink/netlink_snl.h
+++ b/sys/netlink/netlink_snl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_snl_generic.h b/sys/netlink/netlink_snl_generic.h
index a725e6948b43..1a1e592aa54d 100644
--- a/sys/netlink/netlink_snl_generic.h
+++ b/sys/netlink/netlink_snl_generic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_snl_route.h b/sys/netlink/netlink_snl_route.h
index e67bffde215e..1bb230b02524 100644
--- a/sys/netlink/netlink_snl_route.h
+++ b/sys/netlink/netlink_snl_route.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_snl_route_compat.h b/sys/netlink/netlink_snl_route_compat.h
index 0314c5715e4f..87c65f1adcda 100644
--- a/sys/netlink/netlink_snl_route_compat.h
+++ b/sys/netlink/netlink_snl_route_compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h
index ba9ead461c80..911e69f5ecd2 100644
--- a/sys/netlink/netlink_snl_route_parsers.h
+++ b/sys/netlink/netlink_snl_route_parsers.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h
index ed19008248e9..c19f1fde89f9 100644
--- a/sys/netlink/netlink_var.h
+++ b/sys/netlink/netlink_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netlink/route/common.h b/sys/netlink/route/common.h
index 1f1d98dc4384..5cd3a5ee3524 100644
--- a/sys/netlink/route/common.h
+++ b/sys/netlink/route/common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c
index ffd1be9384e1..0c5a618d9b77 100644
--- a/sys/netlink/route/iface.c
+++ b/sys/netlink/route/iface.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c
index be28a0f3b676..f126df2b2413 100644
--- a/sys/netlink/route/iface_drivers.c
+++ b/sys/netlink/route/iface_drivers.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/ifaddrs.h b/sys/netlink/route/ifaddrs.h
index 7ada8f22bf7b..3436e21f9437 100644
--- a/sys/netlink/route/ifaddrs.h
+++ b/sys/netlink/route/ifaddrs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/interface.h b/sys/netlink/route/interface.h
index 12a8aa718993..cec4d35b811b 100644
--- a/sys/netlink/route/interface.h
+++ b/sys/netlink/route/interface.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c
index 8cd1e31ce67a..cfa6d43173e0 100644
--- a/sys/netlink/route/neigh.c
+++ b/sys/netlink/route/neigh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h
index 1ec1b95fdcde..d6835505ea74 100644
--- a/sys/netlink/route/neigh.h
+++ b/sys/netlink/route/neigh.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c
index b435a9afb3e7..398733c1ad94 100644
--- a/sys/netlink/route/nexthop.c
+++ b/sys/netlink/route/nexthop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/nexthop.h b/sys/netlink/route/nexthop.h
index 310c3e08fc4b..ad12e514a237 100644
--- a/sys/netlink/route/nexthop.h
+++ b/sys/netlink/route/nexthop.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h
index b4b326b2b06b..9247a59855bb 100644
--- a/sys/netlink/route/route.h
+++ b/sys/netlink/route/route.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/route_var.h b/sys/netlink/route/route_var.h
index f3b1d7d929a5..71b89dcf09d5 100644
--- a/sys/netlink/route/route_var.h
+++ b/sys/netlink/route/route_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
*
diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c
index badd8d937be2..4063b7e31096 100644
--- a/sys/netlink/route/rt.c
+++ b/sys/netlink/route/rt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ng Peng Nam Sean
* Copyright (c) 2022 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/dn_heap.c b/sys/netpfil/ipfw/dn_heap.c
index ab81cfcc656a..d1c386e48697 100644
--- a/sys/netpfil/ipfw/dn_heap.c
+++ b/sys/netpfil/ipfw/dn_heap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2002,2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_heap.h b/sys/netpfil/ipfw/dn_heap.h
index 1a7032cc3f80..f50ffdef33eb 100644
--- a/sys/netpfil/ipfw/dn_heap.h
+++ b/sys/netpfil/ipfw/dn_heap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_sched.h b/sys/netpfil/ipfw/dn_sched.h
index 5c506c1d30ac..1cc264d335e3 100644
--- a/sys/netpfil/ipfw/dn_sched.h
+++ b/sys/netpfil/ipfw/dn_sched.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Riccardo Panicucci, Luigi Rizzo, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_sched_fifo.c b/sys/netpfil/ipfw/dn_sched_fifo.c
index 454d32a02d7a..454e1f4ea93d 100644
--- a/sys/netpfil/ipfw/dn_sched_fifo.c
+++ b/sys/netpfil/ipfw/dn_sched_fifo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_sched_prio.c b/sys/netpfil/ipfw/dn_sched_prio.c
index 703158c0d829..74e07305e9cd 100644
--- a/sys/netpfil/ipfw/dn_sched_prio.c
+++ b/sys/netpfil/ipfw/dn_sched_prio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_sched_qfq.c b/sys/netpfil/ipfw/dn_sched_qfq.c
index e02f27dfd85e..23ea60da8305 100644
--- a/sys/netpfil/ipfw/dn_sched_qfq.c
+++ b/sys/netpfil/ipfw/dn_sched_qfq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Fabio Checconi, Luigi Rizzo, Paolo Valente
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_sched_rr.c b/sys/netpfil/ipfw/dn_sched_rr.c
index 701ce490d605..77db7a6a657f 100644
--- a/sys/netpfil/ipfw/dn_sched_rr.c
+++ b/sys/netpfil/ipfw/dn_sched_rr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/dn_sched_wf2q.c b/sys/netpfil/ipfw/dn_sched_wf2q.c
index 7285df0d1d7d..c33fda501feb 100644
--- a/sys/netpfil/ipfw/dn_sched_wf2q.c
+++ b/sys/netpfil/ipfw/dn_sched_wf2q.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
* Copyright (c) 2000-2002 Luigi Rizzo, Universita` di Pisa
diff --git a/sys/netpfil/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c
index a690aa0290d7..29a426b91e4e 100644
--- a/sys/netpfil/ipfw/ip_dn_glue.c
+++ b/sys/netpfil/ipfw/ip_dn_glue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
index dad5cb087b39..8b394272876c 100644
--- a/sys/netpfil/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Luigi Rizzo, Riccardo Panicucci, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h
index 25015fe02c2d..3aba95cb8c47 100644
--- a/sys/netpfil/ipfw/ip_dn_private.h
+++ b/sys/netpfil/ipfw/ip_dn_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Luigi Rizzo, Riccardo Panicucci, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c
index a157b3d928cd..a0b6085de81e 100644
--- a/sys/netpfil/ipfw/ip_dummynet.c
+++ b/sys/netpfil/ipfw/ip_dummynet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Codel/FQ_Codel and PIE/FQ-PIE Code:
* Copyright (C) 2016 Centre for Advanced Internet Architectures,
diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c
index db63f4c34572..caec29844b36 100644
--- a/sys/netpfil/ipfw/ip_fw2.c
+++ b/sys/netpfil/ipfw/ip_fw2.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
*
diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c
index 3b96a9ac019f..d4d0bf41e209 100644
--- a/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ b/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017-2018 Yandex LLC
* Copyright (c) 2017-2018 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/ip_fw_log.c b/sys/netpfil/ipfw/ip_fw_log.c
index 969823ebf86f..723a7dab978b 100644
--- a/sys/netpfil/ipfw/ip_fw_log.c
+++ b/sys/netpfil/ipfw/ip_fw_log.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
*
diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c
index 4dfe45494e2c..4eafa3e27605 100644
--- a/sys/netpfil/ipfw/ip_fw_nat.c
+++ b/sys/netpfil/ipfw/ip_fw_nat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Paolo Pisati
* All rights reserved.
diff --git a/sys/netpfil/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c
index 01a44df47180..a2e2b2437e10 100644
--- a/sys/netpfil/ipfw/ip_fw_pfil.c
+++ b/sys/netpfil/ipfw/ip_fw_pfil.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Andre Oppermann, Internet Business Solutions AG
* All rights reserved.
diff --git a/sys/netpfil/ipfw/ip_fw_private.h b/sys/netpfil/ipfw/ip_fw_private.h
index 1440b1a40eee..3b44077ea255 100644
--- a/sys/netpfil/ipfw/ip_fw_private.h
+++ b/sys/netpfil/ipfw/ip_fw_private.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
*
diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c
index 6d2a119ecbe0..86e70f1acfbf 100644
--- a/sys/netpfil/ipfw/ip_fw_sockopt.c
+++ b/sys/netpfil/ipfw/ip_fw_sockopt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
* Copyright (c) 2014 Yandex LLC
diff --git a/sys/netpfil/ipfw/ip_fw_table.c b/sys/netpfil/ipfw/ip_fw_table.c
index 7df892eb1c67..3f45248234f6 100644
--- a/sys/netpfil/ipfw/ip_fw_table.c
+++ b/sys/netpfil/ipfw/ip_fw_table.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Ruslan Ermilov and Vsevolod Lobko.
* Copyright (c) 2014 Yandex LLC
diff --git a/sys/netpfil/ipfw/nat64/ip_fw_nat64.c b/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
index fef456998432..1790a7fbddc1 100644
--- a/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
+++ b/sys/netpfil/ipfw/nat64/ip_fw_nat64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/ip_fw_nat64.h b/sys/netpfil/ipfw/nat64/ip_fw_nat64.h
index d6f38405cfba..6e2fc8ee176f 100644
--- a/sys/netpfil/ipfw/nat64/ip_fw_nat64.h
+++ b/sys/netpfil/ipfw/nat64/ip_fw_nat64.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64_translate.c b/sys/netpfil/ipfw/nat64/nat64_translate.c
index fecc8ff334d2..42368a1e28bf 100644
--- a/sys/netpfil/ipfw/nat64/nat64_translate.c
+++ b/sys/netpfil/ipfw/nat64/nat64_translate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64_translate.h b/sys/netpfil/ipfw/nat64/nat64_translate.h
index deaf4fd5c0e9..e8cdd77593b3 100644
--- a/sys/netpfil/ipfw/nat64/nat64_translate.h
+++ b/sys/netpfil/ipfw/nat64/nat64_translate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64clat.c b/sys/netpfil/ipfw/nat64/nat64clat.c
index c48c68183e08..42e85bcfd766 100644
--- a/sys/netpfil/ipfw/nat64/nat64clat.c
+++ b/sys/netpfil/ipfw/nat64/nat64clat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Yandex LLC
* Copyright (c) 2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64clat.h b/sys/netpfil/ipfw/nat64/nat64clat.h
index 70ca5ce5beb6..325dff7290de 100644
--- a/sys/netpfil/ipfw/nat64/nat64clat.h
+++ b/sys/netpfil/ipfw/nat64/nat64clat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Yandex LLC
* Copyright (c) 2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64clat_control.c b/sys/netpfil/ipfw/nat64/nat64clat_control.c
index 1edb01007b38..4c6ea9cac147 100644
--- a/sys/netpfil/ipfw/nat64/nat64clat_control.c
+++ b/sys/netpfil/ipfw/nat64/nat64clat_control.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Yandex LLC
* Copyright (c) 2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64lsn.c b/sys/netpfil/ipfw/nat64/nat64lsn.c
index 9616ecb29a0b..4eb639dc3f77 100644
--- a/sys/netpfil/ipfw/nat64/nat64lsn.c
+++ b/sys/netpfil/ipfw/nat64/nat64lsn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64lsn.h b/sys/netpfil/ipfw/nat64/nat64lsn.h
index 797876b229c2..efa4eb9ae5ed 100644
--- a/sys/netpfil/ipfw/nat64/nat64lsn.h
+++ b/sys/netpfil/ipfw/nat64/nat64lsn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64lsn_control.c b/sys/netpfil/ipfw/nat64/nat64lsn_control.c
index 52eb22a0953c..693253655f84 100644
--- a/sys/netpfil/ipfw/nat64/nat64lsn_control.c
+++ b/sys/netpfil/ipfw/nat64/nat64lsn_control.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64stl.c b/sys/netpfil/ipfw/nat64/nat64stl.c
index a3451a107579..fc75723013db 100644
--- a/sys/netpfil/ipfw/nat64/nat64stl.c
+++ b/sys/netpfil/ipfw/nat64/nat64stl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64stl.h b/sys/netpfil/ipfw/nat64/nat64stl.h
index 385e92a7e4ef..25f89210c9cf 100644
--- a/sys/netpfil/ipfw/nat64/nat64stl.h
+++ b/sys/netpfil/ipfw/nat64/nat64stl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015-2019 Andrey V. Elsukov <ae@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/nat64/nat64stl_control.c b/sys/netpfil/ipfw/nat64/nat64stl_control.c
index 93b1dfe49b1b..8c211f88c93c 100644
--- a/sys/netpfil/ipfw/nat64/nat64stl_control.c
+++ b/sys/netpfil/ipfw/nat64/nat64stl_control.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2019 Yandex LLC
* Copyright (c) 2015 Alexander V. Chernikov <melifaro@FreeBSD.org>
diff --git a/sys/netpfil/ipfw/test/test_dn_heap.c b/sys/netpfil/ipfw/test/test_dn_heap.c
index a608768c3b96..81400097c1df 100644
--- a/sys/netpfil/ipfw/test/test_dn_heap.c
+++ b/sys/netpfil/ipfw/test/test_dn_heap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2002,2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 9cf1071b3248..4938b1bb45ee 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC)
+ * SPDX-License-Identifier: (BSD-2-Clause AND ISC)
*
* Copyright (c) 2002 Michael Shalayeff
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
diff --git a/sys/netpfil/pf/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h
index e3f6f85f21d0..855955a87dfe 100644
--- a/sys/netpfil/pf/pf_mtag.h
+++ b/sys/netpfil/pf/pf_mtag.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c
index 11f99ce23fac..c1c7bb8d42c5 100644
--- a/sys/netpfil/pf/pf_nv.c
+++ b/sys/netpfil/pf/pf_nv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/netpfil/pf/pf_nv.h b/sys/netpfil/pf/pf_nv.h
index 7ac3bc4153ee..cd3ffa0e5c65 100644
--- a/sys/netpfil/pf/pf_nv.h
+++ b/sys/netpfil/pf/pf_nv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
*
diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c
index 42cd633f8411..8e4d720daaf4 100644
--- a/sys/netpfil/pf/pf_table.c
+++ b/sys/netpfil/pf/pf_table.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Cedric Berger
* All rights reserved.
diff --git a/sys/netsmb/netbios.h b/sys/netsmb/netbios.h
index 206b9c7c0331..2056b703c467 100644
--- a/sys/netsmb/netbios.h
+++ b/sys/netsmb/netbios.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index 42c14bc5fdb7..8734a455be02 100644
--- a/sys/netsmb/smb.h
+++ b/sys/netsmb/smb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index a1fe0a1983ce..5b1d30699729 100644
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_conn.h b/sys/netsmb/smb_conn.h
index 1ce8e3b623ac..da33955252e6 100644
--- a/sys/netsmb/smb_conn.h
+++ b/sys/netsmb/smb_conn.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index 0b577564aff7..2db07c4555cd 100644
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_dev.h b/sys/netsmb/smb_dev.h
index 2c927346a96d..c421f2fa60f2 100644
--- a/sys/netsmb/smb_dev.h
+++ b/sys/netsmb/smb_dev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index a004d04b3bf3..c0a8553b526f 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index c5d5d0f85742..3e4fc0804620 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_rq.h b/sys/netsmb/smb_rq.h
index c8f16539a938..02b1ebe6074e 100644
--- a/sys/netsmb/smb_rq.h
+++ b/sys/netsmb/smb_rq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index 29bb888fbd24..207c1306b031 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index eb962711c4dc..41fd185be90b 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h
index e24c50f7978c..ae1b5bc2454a 100644
--- a/sys/netsmb/smb_subr.h
+++ b/sys/netsmb/smb_subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_tran.h b/sys/netsmb/smb_tran.h
index 2cc2471a0077..e8480c211e48 100644
--- a/sys/netsmb/smb_tran.h
+++ b/sys/netsmb/smb_tran.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 051aade51217..7638d143a373 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_trantcp.h b/sys/netsmb/smb_trantcp.h
index 889a43acaea1..9ddb841240be 100644
--- a/sys/netsmb/smb_trantcp.h
+++ b/sys/netsmb/smb_trantcp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/netsmb/smb_usr.c b/sys/netsmb/smb_usr.c
index f9ca0044d84d..176e2db608b4 100644
--- a/sys/netsmb/smb_usr.c
+++ b/sys/netsmb/smb_usr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/nfs/nfs_kdtrace.h b/sys/nfs/nfs_kdtrace.h
index 560937fd2707..bb395253307f 100644
--- a/sys/nfs/nfs_kdtrace.h
+++ b/sys/nfs/nfs_kdtrace.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/nfs/nfs_mountcommon.h b/sys/nfs/nfs_mountcommon.h
index d8762cf117b9..aa08cb0cbafc 100644
--- a/sys/nfs/nfs_mountcommon.h
+++ b/sys/nfs/nfs_mountcommon.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
diff --git a/sys/nfsserver/nfs_fha_old.h b/sys/nfsserver/nfs_fha_old.h
index c7845aca8157..157452f3126d 100644
--- a/sys/nfsserver/nfs_fha_old.h
+++ b/sys/nfsserver/nfs_fha_old.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Copyright (c) 2013 Spectra Logic Corporation
diff --git a/sys/nlm/nlm.h b/sys/nlm/nlm.h
index cd45ac821f16..7e0e93bf965f 100644
--- a/sys/nlm/nlm.h
+++ b/sys/nlm/nlm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/nlm/nlm_advlock.c b/sys/nlm/nlm_advlock.c
index 17c4a556eae1..6f361787f4f3 100644
--- a/sys/nlm/nlm_advlock.c
+++ b/sys/nlm/nlm_advlock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c
index c84d1bffaac5..ba519347f6ea 100644
--- a/sys/nlm/nlm_prot_impl.c
+++ b/sys/nlm/nlm_prot_impl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/nlm/nlm_prot_server.c b/sys/nlm/nlm_prot_server.c
index d8e082d45496..fe98db2ee968 100644
--- a/sys/nlm/nlm_prot_server.c
+++ b/sys/nlm/nlm_prot_server.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/nlm/nlm_prot_svc.c b/sys/nlm/nlm_prot_svc.c
index fb4f2073b3bf..d647918f2078 100644
--- a/sys/nlm/nlm_prot_svc.c
+++ b/sys/nlm/nlm_prot_svc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/ofed/include/rdma/rdma_sdp.h b/sys/ofed/include/rdma/rdma_sdp.h
index 7102bb8e9160..7e224d86e8f5 100644
--- a/sys/ofed/include/rdma/rdma_sdp.h
+++ b/sys/ofed/include/rdma/rdma_sdp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Isilon Systems, LLC.
*
diff --git a/sys/opencrypto/xform_chacha20_poly1305.c b/sys/opencrypto/xform_chacha20_poly1305.c
index 9e3414887efc..c85b89958cb5 100644
--- a/sys/opencrypto/xform_chacha20_poly1305.c
+++ b/sys/opencrypto/xform_chacha20_poly1305.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Netflix Inc.
*
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index 59a742ff9967..cc93d57fef75 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause
*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index 84b6cd0c3730..04a6aee9dcf8 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2015 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/aim/mmu_oea64.h b/sys/powerpc/aim/mmu_oea64.h
index e0b47bad8eed..661ce4eef37d 100644
--- a/sys/powerpc/aim/mmu_oea64.h
+++ b/sys/powerpc/aim/mmu_oea64.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c
index 4210f1faf0a6..739597217eb2 100644
--- a/sys/powerpc/aim/mmu_radix.c
+++ b/sys/powerpc/aim/mmu_radix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Matthew Macy
*
diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c
index aff828a31d6a..295872dcb01e 100644
--- a/sys/powerpc/aim/moea64_native.c
+++ b/sys/powerpc/aim/moea64_native.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND 4-Clause-BSD
+ * SPDX-License-Identifier: BSD-2-Clause AND 4-Clause-BSD
*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c
index a73246487683..dafb12063fbb 100644
--- a/sys/powerpc/aim/mp_cpudep.c
+++ b/sys/powerpc/aim/mp_cpudep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/aim/slb.c b/sys/powerpc/aim/slb.c
index fb198072730a..b8ddc71653bf 100644
--- a/sys/powerpc/aim/slb.c
+++ b/sys/powerpc/aim/slb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/booke/machdep_e500.c b/sys/powerpc/booke/machdep_e500.c
index 0e4ac3943e2b..87f108216c7e 100644
--- a/sys/powerpc/booke/machdep_e500.c
+++ b/sys/powerpc/booke/machdep_e500.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Semihalf.
* All rights reserved.
diff --git a/sys/powerpc/booke/mp_cpudep.c b/sys/powerpc/booke/mp_cpudep.c
index b8b939a785ed..452470a7b231 100644
--- a/sys/powerpc/booke/mp_cpudep.c
+++ b/sys/powerpc/booke/mp_cpudep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Semihalf, Rafal Jaworowski
* All rights reserved.
diff --git a/sys/powerpc/booke/platform_bare.c b/sys/powerpc/booke/platform_bare.c
index 0fc1e299f78e..cdb5a8eea79c 100644
--- a/sys/powerpc/booke/platform_bare.c
+++ b/sys/powerpc/booke/platform_bare.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Semihalf.
* All rights reserved.
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
index 2d16bba90925..43b7b87127bd 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2007-2009 Semihalf, Rafal Jaworowski <raj@semihalf.com>
* Copyright (C) 2006 Semihalf, Marian Balakowicz <m8@semihalf.com>
diff --git a/sys/powerpc/booke/pmap_32.c b/sys/powerpc/booke/pmap_32.c
index fa9e0a6422d8..bb6ba04253d3 100644
--- a/sys/powerpc/booke/pmap_32.c
+++ b/sys/powerpc/booke/pmap_32.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2020 Justin Hibbits
* Copyright (C) 2007-2009 Semihalf, Rafal Jaworowski <raj@semihalf.com>
diff --git a/sys/powerpc/booke/pmap_64.c b/sys/powerpc/booke/pmap_64.c
index 05db755740a1..5f45c41adbea 100644
--- a/sys/powerpc/booke/pmap_64.c
+++ b/sys/powerpc/booke/pmap_64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2020 Justin Hibbits
* Copyright (C) 2007-2009 Semihalf, Rafal Jaworowski <raj@semihalf.com>
diff --git a/sys/powerpc/cpufreq/dfs.c b/sys/powerpc/cpufreq/dfs.c
index d5c605908951..e77ad3c07223 100644
--- a/sys/powerpc/cpufreq/dfs.c
+++ b/sys/powerpc/cpufreq/dfs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/cpufreq/pcr.c b/sys/powerpc/cpufreq/pcr.c
index 4537b652d7f5..79470c80c025 100644
--- a/sys/powerpc/cpufreq/pcr.c
+++ b/sys/powerpc/cpufreq/pcr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/cpufreq/pmcr.c b/sys/powerpc/cpufreq/pmcr.c
index 1bc6ba09b01f..dc521e197162 100644
--- a/sys/powerpc/cpufreq/pmcr.c
+++ b/sys/powerpc/cpufreq/pmcr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Justin Hibbits
*
diff --git a/sys/powerpc/cpufreq/pmufreq.c b/sys/powerpc/cpufreq/pmufreq.c
index 8dae34c38fff..97dde31dcf50 100644
--- a/sys/powerpc/cpufreq/pmufreq.c
+++ b/sys/powerpc/cpufreq/pmufreq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Justin Hibbits
* Copyright (c) 2009 Nathan Whitehorn
diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h
index 5a36ee68da6e..5df435c64726 100644
--- a/sys/powerpc/include/_bus.h
+++ b/sys/powerpc/include/_bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/sys/powerpc/include/_inttypes.h b/sys/powerpc/include/_inttypes.h
index 8cfdcd727f1b..8d10a76b3ad3 100644
--- a/sys/powerpc/include/_inttypes.h
+++ b/sys/powerpc/include/_inttypes.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/powerpc/include/altivec.h b/sys/powerpc/include/altivec.h
index f392c708e6df..3d0ba923c0d1 100644
--- a/sys/powerpc/include/altivec.h
+++ b/sys/powerpc/include/altivec.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h
index 9b8138c8dbb6..03566ecf1d3a 100644
--- a/sys/powerpc/include/atomic.h
+++ b/sys/powerpc/include/atomic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2001 Benno Rice
diff --git a/sys/powerpc/include/bus_dma.h b/sys/powerpc/include/bus_dma.h
index 947a25819a7e..0ddda1831dcf 100644
--- a/sys/powerpc/include/bus_dma.h
+++ b/sys/powerpc/include/bus_dma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Scott Long
* All rights reserved.
diff --git a/sys/powerpc/include/counter.h b/sys/powerpc/include/counter.h
index 05bc88c1480e..e86cf553e874 100644
--- a/sys/powerpc/include/counter.h
+++ b/sys/powerpc/include/counter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, 2013 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index 7b0039166436..cfff92ba8fab 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/powerpc/include/dbdma.h b/sys/powerpc/include/dbdma.h
index 9827876af68f..3c856ff8c4ed 100644
--- a/sys/powerpc/include/dbdma.h
+++ b/sys/powerpc/include/dbdma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h
index c88e1550a0c7..ac05f998859b 100644
--- a/sys/powerpc/include/elf.h
+++ b/sys/powerpc/include/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1996-1997 John D. Polstra.
diff --git a/sys/powerpc/include/gdb_machdep.h b/sys/powerpc/include/gdb_machdep.h
index 5edf4d96cb7c..122f8363d65c 100644
--- a/sys/powerpc/include/gdb_machdep.h
+++ b/sys/powerpc/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/include/ifunc.h b/sys/powerpc/include/ifunc.h
index 4aec7df48186..9a5fe85cab7a 100644
--- a/sys/powerpc/include/ifunc.h
+++ b/sys/powerpc/include/ifunc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Brandon Bergren <bdragon@FreeBSD.org>
* Copyright (c) 2015-2018 The FreeBSD Foundation. All rights reserved.
diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h
index 7ac542537ab8..b1d5797d0eaa 100644
--- a/sys/powerpc/include/intr_machdep.h
+++ b/sys/powerpc/include/intr_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/include/kdb.h b/sys/powerpc/include/kdb.h
index 78e4966eaaf0..f399b7523143 100644
--- a/sys/powerpc/include/kdb.h
+++ b/sys/powerpc/include/kdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/include/machdep.h b/sys/powerpc/include/machdep.h
index 481ae5c6d93c..d3707ced1c39 100644
--- a/sys/powerpc/include/machdep.h
+++ b/sys/powerpc/include/machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Semihalf
* All rights reserved.
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index bfe3427f0712..66ace12b5904 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/powerpc/include/memdev.h b/sys/powerpc/include/memdev.h
index 1e37449aaa9d..e1db4bc9192d 100644
--- a/sys/powerpc/include/memdev.h
+++ b/sys/powerpc/include/memdev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
diff --git a/sys/powerpc/include/metadata.h b/sys/powerpc/include/metadata.h
index 5002b02615d5..704c095c1c53 100644
--- a/sys/powerpc/include/metadata.h
+++ b/sys/powerpc/include/metadata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
diff --git a/sys/powerpc/include/mmuvar.h b/sys/powerpc/include/mmuvar.h
index b449064e009f..fdebc95654ee 100644
--- a/sys/powerpc/include/mmuvar.h
+++ b/sys/powerpc/include/mmuvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
diff --git a/sys/powerpc/include/ofw_machdep.h b/sys/powerpc/include/ofw_machdep.h
index e35ee86e044f..54f50f5cfe65 100644
--- a/sys/powerpc/include/ofw_machdep.h
+++ b/sys/powerpc/include/ofw_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h
index 123af7c1a502..1fe1f5dd7521 100644
--- a/sys/powerpc/include/openpicvar.h
+++ b/sys/powerpc/include/openpicvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 31c4b2c47c70..b682fd60af2d 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* Copyright (c) Peter Wemm <peter@netplex.com.au>
diff --git a/sys/powerpc/include/pcpu_aux.h b/sys/powerpc/include/pcpu_aux.h
index 3d4c70c491d6..192254f649c7 100644
--- a/sys/powerpc/include/pcpu_aux.h
+++ b/sys/powerpc/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/powerpc/include/platformvar.h b/sys/powerpc/include/platformvar.h
index d5928e727f82..c77a27e6d51b 100644
--- a/sys/powerpc/include/platformvar.h
+++ b/sys/powerpc/include/platformvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
diff --git a/sys/powerpc/include/rtas.h b/sys/powerpc/include/rtas.h
index 574a404fc302..7315e350a01c 100644
--- a/sys/powerpc/include/rtas.h
+++ b/sys/powerpc/include/rtas.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/include/runq.h b/sys/powerpc/include/runq.h
index 84da6dcd8afa..99b1f6d6deda 100644
--- a/sys/powerpc/include/runq.h
+++ b/sys/powerpc/include/runq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/powerpc/include/sc_machdep.h b/sys/powerpc/include/sc_machdep.h
index 61a2a86f702d..ccd690899eb9 100644
--- a/sys/powerpc/include/sc_machdep.h
+++ b/sys/powerpc/include/sc_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/sys/powerpc/include/slb.h b/sys/powerpc/include/slb.h
index f710aca8de97..feb8802452ac 100644
--- a/sys/powerpc/include/slb.h
+++ b/sys/powerpc/include/slb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/include/smp.h b/sys/powerpc/include/smp.h
index 7f7e767519bd..67e9d51f0bc4 100644
--- a/sys/powerpc/include/smp.h
+++ b/sys/powerpc/include/smp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h
index 4cb39ea7e7be..31342210aca1 100644
--- a/sys/powerpc/include/spr.h
+++ b/sys/powerpc/include/spr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/powerpc/include/sr.h b/sys/powerpc/include/sr.h
index caf7fef50d89..3b94b679c6cf 100644
--- a/sys/powerpc/include/sr.h
+++ b/sys/powerpc/include/sr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/include/vdso.h b/sys/powerpc/include/vdso.h
index 0b3b91aaf80a..c0112c5a4590 100644
--- a/sys/powerpc/include/vdso.h
+++ b/sys/powerpc/include/vdso.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/sys/powerpc/include/vm.h b/sys/powerpc/include/vm.h
index 692bd8fc2d77..eab9d6409bc9 100644
--- a/sys/powerpc/include/vm.h
+++ b/sys/powerpc/include/vm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
diff --git a/sys/powerpc/mambo/mambo.c b/sys/powerpc/mambo/mambo.c
index 6b57d052943a..450ac2f36cb7 100644
--- a/sys/powerpc/mambo/mambo.c
+++ b/sys/powerpc/mambo/mambo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/mambo/mambo_console.c b/sys/powerpc/mambo/mambo_console.c
index 00a501ec9cbe..607ba9b7f5fb 100644
--- a/sys/powerpc/mambo/mambo_console.c
+++ b/sys/powerpc/mambo/mambo_console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 by Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/mambo/mambo_disk.c b/sys/powerpc/mambo/mambo_disk.c
index 935aeab636bc..2a52a697c6fa 100644
--- a/sys/powerpc/mambo/mambo_disk.c
+++ b/sys/powerpc/mambo/mambo_disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/mambo/mambocall.h b/sys/powerpc/mambo/mambocall.h
index a77ba0a8959d..7096cd0f9f88 100644
--- a/sys/powerpc/mambo/mambocall.h
+++ b/sys/powerpc/mambo/mambocall.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/mpc85xx/atpic.c b/sys/powerpc/mpc85xx/atpic.c
index 793311b0de55..1ff21139964f 100644
--- a/sys/powerpc/mpc85xx/atpic.c
+++ b/sys/powerpc/mpc85xx/atpic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Marcel Moolenaar
*
diff --git a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
index 021bd529fe74..a5597a886fd9 100644
--- a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
+++ b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/ds1553_core.c b/sys/powerpc/mpc85xx/ds1553_core.c
index 39ff8d8cd4ae..e8785002a682 100644
--- a/sys/powerpc/mpc85xx/ds1553_core.c
+++ b/sys/powerpc/mpc85xx/ds1553_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/ds1553_reg.h b/sys/powerpc/mpc85xx/ds1553_reg.h
index f81bc0e6ddd6..16d742eeb1f3 100644
--- a/sys/powerpc/mpc85xx/ds1553_reg.h
+++ b/sys/powerpc/mpc85xx/ds1553_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/i2c.c b/sys/powerpc/mpc85xx/i2c.c
index 390e492b2d0b..e090c2b8ccb4 100644
--- a/sys/powerpc/mpc85xx/i2c.c
+++ b/sys/powerpc/mpc85xx/i2c.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008-2009 Semihalf, Michal Hajduk
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/isa.c b/sys/powerpc/mpc85xx/isa.c
index b6b3ea69d494..cc97a8984fd0 100644
--- a/sys/powerpc/mpc85xx/isa.c
+++ b/sys/powerpc/mpc85xx/isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Marcel Moolenaar
*
diff --git a/sys/powerpc/mpc85xx/lbc.h b/sys/powerpc/mpc85xx/lbc.h
index 5d26399d2fca..733943d4283b 100644
--- a/sys/powerpc/mpc85xx/lbc.h
+++ b/sys/powerpc/mpc85xx/lbc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2008, Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c
index 062407713730..699dadf12088 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.c
+++ b/sys/powerpc/mpc85xx/mpc85xx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Semihalf, Rafal Jaworowski
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/mpc85xx.h b/sys/powerpc/mpc85xx/mpc85xx.h
index 1a0be6cb932d..b6de1a151ebb 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.h
+++ b/sys/powerpc/mpc85xx/mpc85xx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Semihalf, Rafal Jaworowski
* Copyright 2006 by Juniper Networks.
diff --git a/sys/powerpc/mpc85xx/mpc85xx_cache.c b/sys/powerpc/mpc85xx/mpc85xx_cache.c
index 575b50eb88a4..8e3a925c954f 100644
--- a/sys/powerpc/mpc85xx/mpc85xx_cache.c
+++ b/sys/powerpc/mpc85xx/mpc85xx_cache.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Justin Hibbits
* All rights reserved.
diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c
index bbb1870c6648..c5c8a1e81032 100644
--- a/sys/powerpc/mpc85xx/platform_mpc85xx.c
+++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2012 Semihalf.
* All rights reserved.
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index c39df7f43814..b913702a0525 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c
index 0b771a509c9f..100ce065f572 100644
--- a/sys/powerpc/ofw/ofw_pcibus.c
+++ b/sys/powerpc/ofw/ofw_pcibus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
diff --git a/sys/powerpc/ofw/ofw_pcibus.h b/sys/powerpc/ofw/ofw_pcibus.h
index 8feec5e9db9a..176522b7a8a1 100644
--- a/sys/powerpc/ofw/ofw_pcibus.h
+++ b/sys/powerpc/ofw/ofw_pcibus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c
index 433a7d3fad24..cb261143da61 100644
--- a/sys/powerpc/ofw/ofw_real.c
+++ b/sys/powerpc/ofw/ofw_real.c
@@ -1,7 +1,7 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*-
- * SPDX-License-Identifier:BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier:BSD-4-Clause AND BSD-2-Clause
*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c
index 633750e1351c..d85c3892cccc 100644
--- a/sys/powerpc/ofw/ofw_syscons.c
+++ b/sys/powerpc/ofw/ofw_syscons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Grehan
* All rights reserved.
diff --git a/sys/powerpc/ofw/ofw_syscons.h b/sys/powerpc/ofw/ofw_syscons.h
index 6ce7173a1a46..7e1e4fe36eb8 100644
--- a/sys/powerpc/ofw/ofw_syscons.h
+++ b/sys/powerpc/ofw/ofw_syscons.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Peter Grehan
* All rights reserved.
diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c
index 65f5ffbdc21a..216d160a7a2e 100644
--- a/sys/powerpc/ofw/rtas.c
+++ b/sys/powerpc/ofw/rtas.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/atibl.c b/sys/powerpc/powermac/atibl.c
index ad78ff743436..4a1a310ed48e 100644
--- a/sys/powerpc/powermac/atibl.c
+++ b/sys/powerpc/powermac/atibl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Justin Hibbits
* All rights reserved.
diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c
index a475cafb93cd..638214fe43e9 100644
--- a/sys/powerpc/powermac/cpcht.c
+++ b/sys/powerpc/powermac/cpcht.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008-2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/dbdma.c b/sys/powerpc/powermac/dbdma.c
index 4fcd161281ec..69c4a20e62a6 100644
--- a/sys/powerpc/powermac/dbdma.c
+++ b/sys/powerpc/powermac/dbdma.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
diff --git a/sys/powerpc/powermac/dbdmavar.h b/sys/powerpc/powermac/dbdmavar.h
index d9b498781daf..6ee7fa73a004 100644
--- a/sys/powerpc/powermac/dbdmavar.h
+++ b/sys/powerpc/powermac/dbdmavar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
diff --git a/sys/powerpc/powermac/fcu.c b/sys/powerpc/powermac/fcu.c
index b354e975f4d4..39b08bea418b 100644
--- a/sys/powerpc/powermac/fcu.c
+++ b/sys/powerpc/powermac/fcu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Andreas Tobler
* All rights reserved.
diff --git a/sys/powerpc/powermac/macgpio.c b/sys/powerpc/powermac/macgpio.c
index 68eb07e7b391..36ccb6e525ff 100644
--- a/sys/powerpc/powermac/macgpio.c
+++ b/sys/powerpc/powermac/macgpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/powermac/macgpiovar.h b/sys/powerpc/powermac/macgpiovar.h
index cae0be206865..335dc39ff16e 100644
--- a/sys/powerpc/powermac/macgpiovar.h
+++ b/sys/powerpc/powermac/macgpiovar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/powermac/nvbl.c b/sys/powerpc/powermac/nvbl.c
index ba1f84badf94..dc5c5520d425 100644
--- a/sys/powerpc/powermac/nvbl.c
+++ b/sys/powerpc/powermac/nvbl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Justin Hibbits
* All rights reserved.
diff --git a/sys/powerpc/powermac/platform_powermac.c b/sys/powerpc/powermac/platform_powermac.c
index 7f78bc63c1ab..a652710954cf 100644
--- a/sys/powerpc/powermac/platform_powermac.c
+++ b/sys/powerpc/powermac/platform_powermac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2009 Nathan Whitehorn
diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c
index ae01b9251b11..f1b7514ba33a 100644
--- a/sys/powerpc/powermac/pmu.c
+++ b/sys/powerpc/powermac/pmu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Michael Lorenz
* Copyright 2008 by Nathan Whitehorn
diff --git a/sys/powerpc/powermac/pmuvar.h b/sys/powerpc/powermac/pmuvar.h
index d20296b13a5e..8d27c512552c 100644
--- a/sys/powerpc/powermac/pmuvar.h
+++ b/sys/powerpc/powermac/pmuvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Michael Lorenz
* Copyright (c) 2008 Nathan Whitehorn
diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c
index 03dbb998559f..18ac51072332 100644
--- a/sys/powerpc/powermac/powermac_thermal.c
+++ b/sys/powerpc/powermac/powermac_thermal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/powermac_thermal.h b/sys/powerpc/powermac/powermac_thermal.h
index 967f29eeb40c..84773caa6f66 100644
--- a/sys/powerpc/powermac/powermac_thermal.h
+++ b/sys/powerpc/powermac/powermac_thermal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c
index df47b5ae6d1f..48f5c17458d7 100644
--- a/sys/powerpc/powermac/pswitch.c
+++ b/sys/powerpc/powermac/pswitch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c
index 6c0badec2ec2..ae0709e998e6 100644
--- a/sys/powerpc/powermac/smu.c
+++ b/sys/powerpc/powermac/smu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/smusat.c b/sys/powerpc/powermac/smusat.c
index a7df8b9227c8..8cb06ca462dd 100644
--- a/sys/powerpc/powermac/smusat.c
+++ b/sys/powerpc/powermac/smusat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index f1f6ffafad63..74282f81295c 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c
index 8933693963f5..2a64eac0cc0f 100644
--- a/sys/powerpc/powermac/uninorthpci.c
+++ b/sys/powerpc/powermac/uninorthpci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h
index ee990d4d6351..631900522acc 100644
--- a/sys/powerpc/powermac/uninorthvar.h
+++ b/sys/powerpc/powermac/uninorthvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/powermac/vcoregpio.c b/sys/powerpc/powermac/vcoregpio.c
index f2037f7b5039..dc95692a50b8 100644
--- a/sys/powerpc/powermac/vcoregpio.c
+++ b/sys/powerpc/powermac/vcoregpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powermac/viareg.h b/sys/powerpc/powermac/viareg.h
index 8af804de962d..dcb06ceecf17 100644
--- a/sys/powerpc/powermac/viareg.h
+++ b/sys/powerpc/powermac/viareg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/powernv/opal_dbg.c b/sys/powerpc/powernv/opal_dbg.c
index 92bcdf10468a..99f7ad5119d1 100644
--- a/sys/powerpc/powernv/opal_dbg.c
+++ b/sys/powerpc/powernv/opal_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Leandro Lupori
*
diff --git a/sys/powerpc/powernv/opal_nvram.c b/sys/powerpc/powernv/opal_nvram.c
index 095f8ebd725b..fe58bfacee28 100644
--- a/sys/powerpc/powernv/opal_nvram.c
+++ b/sys/powerpc/powernv/opal_nvram.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Justin Hibbits
*
diff --git a/sys/powerpc/powernv/xive.c b/sys/powerpc/powernv/xive.c
index 15b8920fe267..ec908b942d6b 100644
--- a/sys/powerpc/powernv/xive.c
+++ b/sys/powerpc/powernv/xive.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2019 Justin Hibbits
*
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c
index acb6ef77c9c6..6a895956afaa 100644
--- a/sys/powerpc/powerpc/autoconf.c
+++ b/sys/powerpc/powerpc/autoconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c
index 9f596d86a141..6428d1defd8b 100644
--- a/sys/powerpc/powerpc/bus_machdep.c
+++ b/sys/powerpc/powerpc/bus_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Semihalf, Rafal Jaworowski <raj@semihalf.com>
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 95eb98a5cbab..120bcf8b84ba 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index 46495108e5f1..3ae729fb002f 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
diff --git a/sys/powerpc/powerpc/copyinout.c b/sys/powerpc/powerpc/copyinout.c
index f6720e8ba09e..5068037cfc66 100644
--- a/sys/powerpc/powerpc/copyinout.c
+++ b/sys/powerpc/powerpc/copyinout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause
*
* Copyright (C) 2002 Benno Rice
* All rights reserved.
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index a8353a30d0aa..1af8b4992951 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (c) 2001 Matt Thomas.
* Copyright (c) 2001 Tsubai Masanari.
diff --git a/sys/powerpc/powerpc/db_hwwatch.c b/sys/powerpc/powerpc/db_hwwatch.c
index aa9018a58417..e50924ce8c20 100644
--- a/sys/powerpc/powerpc/db_hwwatch.c
+++ b/sys/powerpc/powerpc/db_hwwatch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/dump_machdep.c b/sys/powerpc/powerpc/dump_machdep.c
index f27cbf421b79..c86b3fb2777e 100644
--- a/sys/powerpc/powerpc/dump_machdep.c
+++ b/sys/powerpc/powerpc/dump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/powerpc/elf32_machdep.c b/sys/powerpc/powerpc/elf32_machdep.c
index 2efe9a5fdca8..7fea09be594a 100644
--- a/sys/powerpc/powerpc/elf32_machdep.c
+++ b/sys/powerpc/powerpc/elf32_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/elf64_machdep.c b/sys/powerpc/powerpc/elf64_machdep.c
index 93b66461308d..b3b4d9fde938 100644
--- a/sys/powerpc/powerpc/elf64_machdep.c
+++ b/sys/powerpc/powerpc/elf64_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c
index ef987c22f064..0cff8ac15c05 100644
--- a/sys/powerpc/powerpc/exec_machdep.c
+++ b/sys/powerpc/powerpc/exec_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause
*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
diff --git a/sys/powerpc/powerpc/gdb_machdep.c b/sys/powerpc/powerpc/gdb_machdep.c
index e334bd46375c..f3abd57cb35f 100644
--- a/sys/powerpc/powerpc/gdb_machdep.c
+++ b/sys/powerpc/powerpc/gdb_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c
index a9f2aaf36adc..f1cf604d63f7 100644
--- a/sys/powerpc/powerpc/mp_machdep.c
+++ b/sys/powerpc/powerpc/mp_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index a8371e18c6ef..44aee3be4ca7 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c
index b9513c8f4e0c..f3aaf8cebe52 100644
--- a/sys/powerpc/powerpc/platform.c
+++ b/sys/powerpc/powerpc/platform.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Grehan
* Copyright (c) 2009 Nathan Whitehorn
diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c
index 1adfc42eefd1..d8a31ec3bd28 100644
--- a/sys/powerpc/powerpc/pmap_dispatch.c
+++ b/sys/powerpc/powerpc/pmap_dispatch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
diff --git a/sys/powerpc/powerpc/sc_machdep.c b/sys/powerpc/powerpc/sc_machdep.c
index 4e2fd65bce14..00d1ba71e6ef 100644
--- a/sys/powerpc/powerpc/sc_machdep.c
+++ b/sys/powerpc/powerpc/sc_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/sys/powerpc/powerpc/stack_machdep.c b/sys/powerpc/powerpc/stack_machdep.c
index 69117a6b49fc..0b95d1c3e630 100644
--- a/sys/powerpc/powerpc/stack_machdep.c
+++ b/sys/powerpc/powerpc/stack_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
diff --git a/sys/powerpc/powerpc/support.S b/sys/powerpc/powerpc/support.S
index 89dccd558014..49387fa02638 100644
--- a/sys/powerpc/powerpc/support.S
+++ b/sys/powerpc/powerpc/support.S
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/powerpc/powerpc/sys_machdep.c b/sys/powerpc/powerpc/sys_machdep.c
index 0bd357f2d197..6026d55b85c1 100644
--- a/sys/powerpc/powerpc/sys_machdep.c
+++ b/sys/powerpc/powerpc/sys_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Benno Rice.
* All rights reserved.
diff --git a/sys/powerpc/ps3/ehci_ps3.c b/sys/powerpc/ps3/ehci_ps3.c
index de91347d8593..2645a43aa5fa 100644
--- a/sys/powerpc/ps3/ehci_ps3.c
+++ b/sys/powerpc/ps3/ehci_ps3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c
index 39aed8218411..c2ad4ae4be46 100644
--- a/sys/powerpc/ps3/if_glc.c
+++ b/sys/powerpc/ps3/if_glc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/if_glcreg.h b/sys/powerpc/ps3/if_glcreg.h
index dfd6a49126bb..61b2c9d0e818 100644
--- a/sys/powerpc/ps3/if_glcreg.h
+++ b/sys/powerpc/ps3/if_glcreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/mmu_ps3.c b/sys/powerpc/ps3/mmu_ps3.c
index 2d9fdd06c5ac..a7c0216901f4 100644
--- a/sys/powerpc/ps3/mmu_ps3.c
+++ b/sys/powerpc/ps3/mmu_ps3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/ohci_ps3.c b/sys/powerpc/ps3/ohci_ps3.c
index 1a2e64b2a1c3..c52f8e7389ba 100644
--- a/sys/powerpc/ps3/ohci_ps3.c
+++ b/sys/powerpc/ps3/ohci_ps3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/platform_ps3.c b/sys/powerpc/ps3/platform_ps3.c
index 5cdd8cf95b0a..695f2499c292 100644
--- a/sys/powerpc/ps3/platform_ps3.c
+++ b/sys/powerpc/ps3/platform_ps3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c
index ed339f199746..29881aa8deca 100644
--- a/sys/powerpc/ps3/ps3_syscons.c
+++ b/sys/powerpc/ps3/ps3_syscons.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2014 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/ps3bus.c b/sys/powerpc/ps3/ps3bus.c
index 2cb4a85db58e..27aeb6ab8c40 100644
--- a/sys/powerpc/ps3/ps3bus.c
+++ b/sys/powerpc/ps3/ps3bus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* Copyright (C) 2011 glevand (geoffrey.levand@mail.ru)
diff --git a/sys/powerpc/ps3/ps3bus.h b/sys/powerpc/ps3/ps3bus.h
index b93724250840..5bc2fdd26894 100644
--- a/sys/powerpc/ps3/ps3bus.h
+++ b/sys/powerpc/ps3/ps3bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/ps3/ps3cdrom.c b/sys/powerpc/ps3/ps3cdrom.c
index 776f52d4db7b..315781859b65 100644
--- a/sys/powerpc/ps3/ps3cdrom.c
+++ b/sys/powerpc/ps3/ps3cdrom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Nathan Whitehorn
* Copyright (C) 2011 glevand <geoffrey.levand@mail.ru>
diff --git a/sys/powerpc/ps3/ps3disk.c b/sys/powerpc/ps3/ps3disk.c
index fc972fb9b65c..4dddfbe83e95 100644
--- a/sys/powerpc/ps3/ps3disk.c
+++ b/sys/powerpc/ps3/ps3disk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 glevand (geoffrey.levand@mail.ru)
* All rights reserved.
diff --git a/sys/powerpc/ps3/ps3pic.c b/sys/powerpc/ps3/ps3pic.c
index 423c137fb7f3..e245a1596e39 100644
--- a/sys/powerpc/ps3/ps3pic.c
+++ b/sys/powerpc/ps3/ps3pic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2010 Nathan Whitehorn
*
diff --git a/sys/powerpc/pseries/mmu_phyp.c b/sys/powerpc/pseries/mmu_phyp.c
index 709a7dffc995..a2d234ebac5a 100644
--- a/sys/powerpc/pseries/mmu_phyp.c
+++ b/sys/powerpc/pseries/mmu_phyp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Andreas Tobler
* All rights reserved.
diff --git a/sys/powerpc/pseries/phyp-hvcall.h b/sys/powerpc/pseries/phyp-hvcall.h
index face804aff08..b29613b89ca5 100644
--- a/sys/powerpc/pseries/phyp-hvcall.h
+++ b/sys/powerpc/pseries/phyp-hvcall.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2010 Andreas Tobler
* All rights reserved.
diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c
index 484952177d51..b086a9ea627d 100644
--- a/sys/powerpc/pseries/phyp_console.c
+++ b/sys/powerpc/pseries/phyp_console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 by Nathan Whitehorn. All rights reserved.
*
diff --git a/sys/powerpc/pseries/phyp_dbg.c b/sys/powerpc/pseries/phyp_dbg.c
index c6ba7aa151aa..e7dc10730243 100644
--- a/sys/powerpc/pseries/phyp_dbg.c
+++ b/sys/powerpc/pseries/phyp_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Leandro Lupori
*
diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c
index 9b76962f70f9..b01c458f369a 100644
--- a/sys/powerpc/pseries/phyp_llan.c
+++ b/sys/powerpc/pseries/phyp_llan.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/phyp_vscsi.c b/sys/powerpc/pseries/phyp_vscsi.c
index 5e72daa56dae..e393a61b59a3 100644
--- a/sys/powerpc/pseries/phyp_vscsi.c
+++ b/sys/powerpc/pseries/phyp_vscsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2013 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/platform_chrp.c b/sys/powerpc/pseries/platform_chrp.c
index f095e97edaf1..ea8ac52da44b 100644
--- a/sys/powerpc/pseries/platform_chrp.c
+++ b/sys/powerpc/pseries/platform_chrp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2009 Nathan Whitehorn
diff --git a/sys/powerpc/pseries/plpar_iommu.c b/sys/powerpc/pseries/plpar_iommu.c
index d403d91ce94a..9ff78198ca86 100644
--- a/sys/powerpc/pseries/plpar_iommu.c
+++ b/sys/powerpc/pseries/plpar_iommu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* All rights reserved.
diff --git a/sys/powerpc/pseries/plpar_iommu.h b/sys/powerpc/pseries/plpar_iommu.h
index 12e8becd7325..845354628280 100644
--- a/sys/powerpc/pseries/plpar_iommu.h
+++ b/sys/powerpc/pseries/plpar_iommu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
* All rights reserved.
diff --git a/sys/powerpc/pseries/plpar_pcibus.c b/sys/powerpc/pseries/plpar_pcibus.c
index 23abb4acd53b..2449f530b0cf 100644
--- a/sys/powerpc/pseries/plpar_pcibus.c
+++ b/sys/powerpc/pseries/plpar_pcibus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c
index 55d2b2d3a92f..c5c996d996ed 100644
--- a/sys/powerpc/pseries/rtas_dev.c
+++ b/sys/powerpc/pseries/rtas_dev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c
index 97ece878aa7b..e297c1f222c3 100644
--- a/sys/powerpc/pseries/rtas_pci.c
+++ b/sys/powerpc/pseries/rtas_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c
index d300b2e8457b..a4fcba02019a 100644
--- a/sys/powerpc/pseries/vdevice.c
+++ b/sys/powerpc/pseries/vdevice.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/sys/powerpc/pseries/xics.c b/sys/powerpc/pseries/xics.c
index 393b88976554..6210a342dfb2 100644
--- a/sys/powerpc/pseries/xics.c
+++ b/sys/powerpc/pseries/xics.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2011 Nathan Whitehorn
*
diff --git a/sys/riscv/include/gdb_machdep.h b/sys/riscv/include/gdb_machdep.h
index 422f57a5742b..d42703e72160 100644
--- a/sys/riscv/include/gdb_machdep.h
+++ b/sys/riscv/include/gdb_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Mitchell Horne <mhorne@FreeBSD.org>
*
diff --git a/sys/riscv/include/metadata.h b/sys/riscv/include/metadata.h
index 520b7b6fca3a..f6702ab435f5 100644
--- a/sys/riscv/include/metadata.h
+++ b/sys/riscv/include/metadata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Mitchell Horne <mhorne@FreeBSD.org>
*
diff --git a/sys/riscv/include/pcpu_aux.h b/sys/riscv/include/pcpu_aux.h
index 9fecd25c67cb..a394901e0845 100644
--- a/sys/riscv/include/pcpu_aux.h
+++ b/sys/riscv/include/pcpu_aux.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/riscv/riscv/gdb_machdep.c b/sys/riscv/riscv/gdb_machdep.c
index 06d4b8ba6e22..8d2054f6a6b9 100644
--- a/sys/riscv/riscv/gdb_machdep.c
+++ b/sys/riscv/riscv/gdb_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Mitchell Horne <mhorne@FreeBSD.org>
*
diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c
index aeb2b4835d16..116fe3efa707 100644
--- a/sys/riscv/riscv/plic.c
+++ b/sys/riscv/riscv/plic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/riscv/riscv/riscv_syscon.c b/sys/riscv/riscv/riscv_syscon.c
index 8613b298b797..077c5b2eaf34 100644
--- a/sys/riscv/riscv/riscv_syscon.c
+++ b/sys/riscv/riscv/riscv_syscon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
* Copyright (c) 2020 Jessica Clarke <jrtc27@FreeBSD.org>
diff --git a/sys/riscv/riscv/sbi.c b/sys/riscv/riscv/sbi.c
index 6897fce9cad3..47aa22f9488c 100644
--- a/sys/riscv/riscv/sbi.c
+++ b/sys/riscv/riscv/sbi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Mitchell Horne <mhorne@FreeBSD.org>
*
diff --git a/sys/riscv/riscv/soc.c b/sys/riscv/riscv/soc.c
index 52d9c64a03de..0f9210d0d03d 100644
--- a/sys/riscv/riscv/soc.c
+++ b/sys/riscv/riscv/soc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
diff --git a/sys/riscv/sifive/fe310_aon.c b/sys/riscv/sifive/fe310_aon.c
index a9819421852a..4c5cc3251fa5 100644
--- a/sys/riscv/sifive/fe310_aon.c
+++ b/sys/riscv/sifive/fe310_aon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Axiado Corporation
* All rights reserved.
diff --git a/sys/riscv/sifive/fu740_pci_dw.c b/sys/riscv/sifive/fu740_pci_dw.c
index fbb62cc44e65..3c4dd0b97c95 100644
--- a/sys/riscv/sifive/fu740_pci_dw.c
+++ b/sys/riscv/sifive/fu740_pci_dw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2021 Jessica Clarke <jrtc27@FreeBSD.org>
*
diff --git a/sys/riscv/sifive/sifive_gpio.c b/sys/riscv/sifive/sifive_gpio.c
index 47d03ca448d5..7138cc4d04ba 100644
--- a/sys/riscv/sifive/sifive_gpio.c
+++ b/sys/riscv/sifive/sifive_gpio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Jessica Clarke <jrtc27@FreeBSD.org>
*
diff --git a/sys/riscv/sifive/sifive_prci.c b/sys/riscv/sifive/sifive_prci.c
index fee67bb153ac..9963faaac5a6 100644
--- a/sys/riscv/sifive/sifive_prci.c
+++ b/sys/riscv/sifive/sifive_prci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Axiado Corporation
* All rights reserved.
diff --git a/sys/riscv/sifive/sifive_spi.c b/sys/riscv/sifive/sifive_spi.c
index 4a5d79fec01d..343add06495b 100644
--- a/sys/riscv/sifive/sifive_spi.c
+++ b/sys/riscv/sifive/sifive_spi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Axiado Corporation
* All rights reserved.
diff --git a/sys/riscv/sifive/sifive_uart.c b/sys/riscv/sifive/sifive_uart.c
index 9a952e940120..7a770f2dedc2 100644
--- a/sys/riscv/sifive/sifive_uart.c
+++ b/sys/riscv/sifive/sifive_uart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Axiado Corporation
* All rights reserved.
diff --git a/sys/rpc/clnt_rc.c b/sys/rpc/clnt_rc.c
index aa69356b8cd2..a1db839ca896 100644
--- a/sys/rpc/clnt_rc.c
+++ b/sys/rpc/clnt_rc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/rpc/getnetconfig.c b/sys/rpc/getnetconfig.c
index 05b30dfe74dc..d907fa268f24 100644
--- a/sys/rpc/getnetconfig.c
+++ b/sys/rpc/getnetconfig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/rpc/replay.c b/sys/rpc/replay.c
index 8e161f725414..8295156da4be 100644
--- a/sys/rpc/replay.c
+++ b/sys/rpc/replay.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/rpc/replay.h b/sys/rpc/replay.h
index 68b27800867a..2a127d6d2c68 100644
--- a/sys/rpc/replay.h
+++ b/sys/rpc/replay.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/rpc/rpcsec_gss.h b/sys/rpc/rpcsec_gss.h
index ce6b8a3aa58f..7661c50cf71f 100644
--- a/sys/rpc/rpcsec_gss.h
+++ b/sys/rpc/rpcsec_gss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c b/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c
index 406821aa0672..fca8a4ae6b41 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c b/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c
index 5c1e944acd54..ab900437de0e 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
diff --git a/sys/rpc/rpcsec_tls.h b/sys/rpc/rpcsec_tls.h
index 77c969c0655e..13edd94cd865 100644
--- a/sys/rpc/rpcsec_tls.h
+++ b/sys/rpc/rpcsec_tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Rick Macklem
*
diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c
index 3b3452a8b624..994b69d041a4 100644
--- a/sys/rpc/rpcsec_tls/rpctls_impl.c
+++ b/sys/rpc/rpcsec_tls/rpctls_impl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/sys/_atomic64e.h b/sys/sys/_atomic64e.h
index d0abdc2e5a89..3f927504a77d 100644
--- a/sys/sys/_atomic64e.h
+++ b/sys/sys/_atomic64e.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Justin Hibbits
*
diff --git a/sys/sys/_atomic_subword.h b/sys/sys/_atomic_subword.h
index 2c0c70a18cbd..240bf3efe964 100644
--- a/sys/sys/_atomic_subword.h
+++ b/sys/sys/_atomic_subword.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h
index 70b9713ffada..b829716cfec0 100644
--- a/sys/sys/_bitset.h
+++ b/sys/sys/_bitset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/_blockcount.h b/sys/sys/_blockcount.h
index e4cb7921f8b5..54a422a73fbd 100644
--- a/sys/sys/_blockcount.h
+++ b/sys/sys/_blockcount.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 The FreeBSD Foundation
*
diff --git a/sys/sys/_bus_dma.h b/sys/sys/_bus_dma.h
index c2a1730186c9..98c02db4a161 100644
--- a/sys/sys/_bus_dma.h
+++ b/sys/sys/_bus_dma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2006 John-Mark Gurney.
* All rights reserved.
diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h
index b75ee595da3c..e7dabe249aac 100644
--- a/sys/sys/_cpuset.h
+++ b/sys/sys/_cpuset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/_domainset.h b/sys/sys/_domainset.h
index 443c68fd331b..c7f65d65e663 100644
--- a/sys/sys/_domainset.h
+++ b/sys/sys/_domainset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/_eventhandler.h b/sys/sys/_eventhandler.h
index 2973bfb3b189..79e39be8a4ec 100644
--- a/sys/sys/_eventhandler.h
+++ b/sys/sys/_eventhandler.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/_ffcounter.h b/sys/sys/_ffcounter.h
index 511b0a598eb7..8de024d20748 100644
--- a/sys/sys/_ffcounter.h
+++ b/sys/sys/_ffcounter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
diff --git a/sys/sys/_lockmgr.h b/sys/sys/_lockmgr.h
index 62e50df1ac4e..0ca99115a53a 100644
--- a/sys/sys/_lockmgr.h
+++ b/sys/sys/_lockmgr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/_null.h b/sys/sys/_null.h
index 8fa5e4246bf8..928c59a1b91e 100644
--- a/sys/sys/_null.h
+++ b/sys/sys/_null.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/sys/_pctrie.h b/sys/sys/_pctrie.h
index d9a98a78bfb2..b7947889e176 100644
--- a/sys/sys/_pctrie.h
+++ b/sys/sys/_pctrie.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/sys/_rangeset.h b/sys/sys/_rangeset.h
index 17f5e374c91f..74f17d8ca488 100644
--- a/sys/sys/_rangeset.h
+++ b/sys/sys/_rangeset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/sys/_rwlock.h b/sys/sys/_rwlock.h
index abd0034a4b20..50fefbc66552 100644
--- a/sys/sys/_rwlock.h
+++ b/sys/sys/_rwlock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/sys/_semaphore.h b/sys/sys/_semaphore.h
index e9991439340c..fe82bfce75f7 100644
--- a/sys/sys/_semaphore.h
+++ b/sys/sys/_semaphore.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/_smr.h b/sys/sys/_smr.h
index 272bf8c07077..27df745b14ed 100644
--- a/sys/sys/_smr.h
+++ b/sys/sys/_smr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, 2020 Jeffrey Roberson <jeff@FreeBSD.org>
*
diff --git a/sys/sys/_stack.h b/sys/sys/_stack.h
index bab8dabd2080..46db5cb16bc5 100644
--- a/sys/sys/_stack.h
+++ b/sys/sys/_stack.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
diff --git a/sys/sys/_stdint.h b/sys/sys/_stdint.h
index 248651535f35..08431cd2feaa 100644
--- a/sys/sys/_stdint.h
+++ b/sys/sys/_stdint.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 David E. O'Brien <obrien@FreeBSD.org>
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
diff --git a/sys/sys/_sx.h b/sys/sys/_sx.h
index 7e53200393b3..ea1f7845c980 100644
--- a/sys/sys/_sx.h
+++ b/sys/sys/_sx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index 043707d3b5f0..34143c33f438 100644
--- a/sys/sys/_task.h
+++ b/sys/sys/_task.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/_timeval.h b/sys/sys/_timeval.h
index 3da7a711eb19..514083f730df 100644
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/_tls_variant_i.h b/sys/sys/_tls_variant_i.h
index 0f83f121cc41..0207585871b9 100644
--- a/sys/sys/_tls_variant_i.h
+++ b/sys/sys/_tls_variant_i.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>.
* All rights reserved.
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 020ba025ea98..33aeb0b81c0d 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/_umtx.h b/sys/sys/_umtx.h
index d280c7d3db19..1bc55416ac19 100644
--- a/sys/sys/_umtx.h
+++ b/sys/sys/_umtx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010, David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/_unrhdr.h b/sys/sys/_unrhdr.h
index 65abe5789710..d8172c3ada65 100644
--- a/sys/sys/_unrhdr.h
+++ b/sys/sys/_unrhdr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/sys/aac_ioctl.h b/sys/sys/aac_ioctl.h
index 6b6e2dee756e..82ff5a28b03f 100644
--- a/sys/sys/aac_ioctl.h
+++ b/sys/sys/aac_ioctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 Scott Long
diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h
index 0df31dbfbdce..23445d9c55b4 100644
--- a/sys/sys/abi_compat.h
+++ b/sys/sys/abi_compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/acl.h b/sys/sys/acl.h
index 196447a6d9cb..5954c28e20f4 100644
--- a/sys/sys/acl.h
+++ b/sys/sys/acl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Robert N. M. Watson
* Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
diff --git a/sys/sys/agpio.h b/sys/sys/agpio.h
index 69b91462f39b..e896f24137a2 100644
--- a/sys/sys/agpio.h
+++ b/sys/sys/agpio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index d3e03efa310e..81fda4208d82 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
diff --git a/sys/sys/arb.h b/sys/sys/arb.h
index aa076e4681b9..9323a288688c 100644
--- a/sys/sys/arb.h
+++ b/sys/sys/arb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2018-2019 Netflix, Inc.
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index 2cebba0e4864..02dfc5dc4907 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/atomic_common.h b/sys/sys/atomic_common.h
index b7bfa151e8ca..79bb2db6f86c 100644
--- a/sys/sys/atomic_common.h
+++ b/sys/sys/atomic_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 The FreeBSD Foundation
*
diff --git a/sys/sys/auxv.h b/sys/sys/auxv.h
index 97616055ecc6..5523edfe77a4 100644
--- a/sys/sys/auxv.h
+++ b/sys/sys/auxv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Michal Meloun
* All rights reserved.
diff --git a/sys/sys/backlight.h b/sys/sys/backlight.h
index 697e0b6b6349..d9b96ccb6739 100644
--- a/sys/sys/backlight.h
+++ b/sys/sys/backlight.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h
index b00f33249cb7..a6e504e7f3b3 100644
--- a/sys/sys/bitset.h
+++ b/sys/sys/bitset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/blockcount.h b/sys/sys/blockcount.h
index de1358b7da48..1d13dd10c112 100644
--- a/sys/sys/blockcount.h
+++ b/sys/sys/blockcount.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
* Copyright (c) 2020 The FreeBSD Foundation
diff --git a/sys/sys/boot.h b/sys/sys/boot.h
index 7874d9663736..7ff92146a9ae 100644
--- a/sys/sys/boot.h
+++ b/sys/sys/boot.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h
index 48c7101aad97..b4c1be0590be 100644
--- a/sys/sys/buf_ring.h
+++ b/sys/sys/buf_ring.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index 0945097077b4..4a370af873ad 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 2179e718c668..0e5b3df5fee7 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997,1998,2003 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/bus_dma_internal.h b/sys/sys/bus_dma_internal.h
index 0f5353974080..6f788265b5a9 100644
--- a/sys/sys/bus_dma_internal.h
+++ b/sys/sys/bus_dma_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Jason A. Harmening.
* All rights reserved.
diff --git a/sys/sys/busdma_bufalloc.h b/sys/sys/busdma_bufalloc.h
index fe281212d20a..e766b3434d5c 100644
--- a/sys/sys/busdma_bufalloc.h
+++ b/sys/sys/busdma_bufalloc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Ian Lepore
* All rights reserved.
diff --git a/sys/sys/caprights.h b/sys/sys/caprights.h
index f4325ea0ba57..4bdadc108b14 100644
--- a/sys/sys/caprights.h
+++ b/sys/sys/caprights.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 FreeBSD Foundation
*
diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h
index af596cd179f4..defc7ed5b35c 100644
--- a/sys/sys/capsicum.h
+++ b/sys/sys/capsicum.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2010, 2015 Robert N. M. Watson
* Copyright (c) 2012 FreeBSD Foundation
diff --git a/sys/sys/clock.h b/sys/sys/clock.h
index 790efdfee19f..72f3a4ed4f81 100644
--- a/sys/sys/clock.h
+++ b/sys/sys/clock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/sys/cnv.h b/sys/sys/cnv.h
index babc913c5637..23d688094a25 100644
--- a/sys/sys/cnv.h
+++ b/sys/sys/cnv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Adam Starak <starak.adam@gmail.com>
* All rights reserved.
diff --git a/sys/sys/compressor.h b/sys/sys/compressor.h
index 5406ef3c3298..f2abd7297bc6 100644
--- a/sys/sys/compressor.h
+++ b/sys/sys/compressor.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014, 2017 Mark Johnston <markj@FreeBSD.org>
*
diff --git a/sys/sys/condvar.h b/sys/sys/condvar.h
index e1a890334afa..81cd49124e25 100644
--- a/sys/sys/condvar.h
+++ b/sys/sys/condvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index c9e070859e6c..05e2309edd80 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1992-2021 The FreeBSD Project. All rights reserved.
*
diff --git a/sys/sys/counter.h b/sys/sys/counter.h
index 3e1b7828d5d4..152ebb830135 100644
--- a/sys/sys/counter.h
+++ b/sys/sys/counter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/coverage.h b/sys/sys/coverage.h
index f00d6b992cf4..2a23893c5be1 100644
--- a/sys/sys/coverage.h
+++ b/sys/sys/coverage.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
* Copyright (C) 2018, 2019 Andrew Turner.
diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h
index 60e2c05af693..853ddcd843ef 100644
--- a/sys/sys/cpu.h
+++ b/sys/sys/cpu.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007 Nate Lawson (SDG)
* All rights reserved.
diff --git a/sys/sys/cpuctl.h b/sys/sys/cpuctl.h
index 8c7fb65632f5..af88cd214516 100644
--- a/sys/sys/cpuctl.h
+++ b/sys/sys/cpuctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006-2008 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h
index 55e1ec5def0c..d0dbf8c1bf1f 100644
--- a/sys/sys/cpuset.h
+++ b/sys/sys/cpuset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/devmap.h b/sys/sys/devmap.h
index af84e5602c67..4eccfab0623f 100644
--- a/sys/sys/devmap.h
+++ b/sys/sys/devmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/disk_zone.h b/sys/sys/disk_zone.h
index 89fc3be716bf..ac5fcbf8e3f7 100644
--- a/sys/sys/disk_zone.h
+++ b/sys/sys/disk_zone.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Spectra Logic Corporation
* All rights reserved.
diff --git a/sys/sys/dnv.h b/sys/sys/dnv.h
index 9ddd8720c923..d66e2b5aa375 100644
--- a/sys/sys/dnv.h
+++ b/sys/sys/dnv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/sys/domainset.h b/sys/sys/domainset.h
index 51b5011fcb4e..10f5c500313e 100644
--- a/sys/sys/domainset.h
+++ b/sys/sys/domainset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h
index 10d67cf699c4..faa82981978d 100644
--- a/sys/sys/dtrace_bsd.h
+++ b/sys/sys/dtrace_bsd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 John Birrell (jb@freebsd.org)
* All rights reserved.
diff --git a/sys/sys/elf.h b/sys/sys/elf.h
index f9bc91b30640..2126393adb1d 100644
--- a/sys/sys/elf.h
+++ b/sys/sys/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index c328ce3b2f80..26a60a451ab9 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index cc5c682e07da..c6149ff6e4ce 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996-1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index f32d9b985605..3d0d87acb052 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, 2018 Dell EMC
* Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index 177de7339d3f..8f2e3cf04a76 100644
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index d91c442e9238..335d33f535db 100644
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/epoch.h b/sys/sys/epoch.h
index 63e03cafd985..03aa9e905e9b 100644
--- a/sys/sys/epoch.h
+++ b/sys/sys/epoch.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/sys/event.h b/sys/sys/event.h
index d413428a528a..ccbb83aceed3 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/eventfd.h b/sys/sys/eventfd.h
index 1bdec8ebc269..1f2e7f1498c5 100644
--- a/sys/sys/eventfd.h
+++ b/sys/sys/eventfd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Greg V
*
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index 48b4942b42d9..df5d9b97d75c 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index 1ed6e9fc4b6b..59be0be86a28 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999,2000 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h
index f24995b80c54..aa47f25985ce 100644
--- a/sys/sys/extattr.h
+++ b/sys/sys/extattr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/sys/fail.h b/sys/sys/fail.h
index dbd2c3e51414..460f9d05e02e 100644
--- a/sys/sys/fail.h
+++ b/sys/sys/fail.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2019 Dell EMC Isilon http://www.isilon.com/
*
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index bceffaed2a37..f5ee646d4395 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
* All rights reserved.
diff --git a/sys/sys/firmware.h b/sys/sys/firmware.h
index 0d74a749f4fc..0f196897c463 100644
--- a/sys/sys/firmware.h
+++ b/sys/sys/firmware.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, Sam Leffler <sam@errno.com>
* All rights reserved.
diff --git a/sys/sys/font.h b/sys/sys/font.h
index 04cab126e906..d249e84812da 100644
--- a/sys/sys/font.h
+++ b/sys/sys/font.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2013 The FreeBSD Foundation
*
diff --git a/sys/sys/gpio.h b/sys/sys/gpio.h
index 9ea1d6636c20..97a04fbfe8e0 100644
--- a/sys/sys/gpio.h
+++ b/sys/sys/gpio.h
@@ -1,7 +1,7 @@
/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
/* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC)
+ * SPDX-License-Identifier: (BSD-2-Clause AND ISC)
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/gpt.h b/sys/sys/gpt.h
index 4e543063754c..82acb393072d 100644
--- a/sys/sys/gpt.h
+++ b/sys/sys/gpt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/sys/gtaskqueue.h b/sys/sys/gtaskqueue.h
index f662aa39f00e..60e4b895c32e 100644
--- a/sys/sys/gtaskqueue.h
+++ b/sys/sys/gtaskqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2016 Matthew Macy <mmacy@mattmacy.io>
diff --git a/sys/sys/hash.h b/sys/sys/hash.h
index 35e76ec758cb..c19e7401794a 100644
--- a/sys/sys/hash.h
+++ b/sys/sys/hash.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Tobias Weingartner
* All rights reserved.
diff --git a/sys/sys/hhook.h b/sys/sys/hhook.h
index 76c827e66939..71f828cfc432 100644
--- a/sys/sys/hhook.h
+++ b/sys/sys/hhook.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index ba9b0e9dd9c8..5dc9b62d8d9b 100644
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
diff --git a/sys/sys/imgact_binmisc.h b/sys/sys/imgact_binmisc.h
index 37ae9dcdd774..3c6316ddfe6f 100644
--- a/sys/sys/imgact_binmisc.h
+++ b/sys/sys/imgact_binmisc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Stacey D. Son
*
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 5feb3ebc9b1f..930a5258e75c 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/intr.h b/sys/sys/intr.h
index 8c51fe7cb504..cb4f2049074e 100644
--- a/sys/sys/intr.h
+++ b/sys/sys/intr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2016 Svatopluk Kraus
* Copyright (c) 2015-2016 Michal Meloun
diff --git a/sys/sys/iov.h b/sys/sys/iov.h
index ee60d6d4320b..af93b21b3ada 100644
--- a/sys/sys/iov.h
+++ b/sys/sys/iov.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2015 Sandvine Inc.
* All rights reserved.
diff --git a/sys/sys/iov_schema.h b/sys/sys/iov_schema.h
index 12e120795bef..f0506bb8878f 100644
--- a/sys/sys/iov_schema.h
+++ b/sys/sys/iov_schema.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014-2015 Sandvine Inc.
* All rights reserved.
diff --git a/sys/sys/ipmi.h b/sys/sys/ipmi.h
index 9b46d1869101..157ce2bf2fe7 100644
--- a/sys/sys/ipmi.h
+++ b/sys/sys/ipmi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index eee971c3b5ce..78b72cab2d75 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2009 James Gritton.
diff --git a/sys/sys/kcov.h b/sys/sys/kcov.h
index 89be2c3df5de..20d78242c609 100644
--- a/sys/sys/kcov.h
+++ b/sys/sys/kcov.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
* Copyright (C) 2018, 2019 Andrew Turner.
diff --git a/sys/sys/kdb.h b/sys/sys/kdb.h
index 5833ebf8285f..1a401714b43e 100644
--- a/sys/sys/kdb.h
+++ b/sys/sys/kdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/sys/kenv.h b/sys/sys/kenv.h
index eccdc027adcc..f9bba392a0a0 100644
--- a/sys/sys/kenv.h
+++ b/sys/sys/kenv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/khelp.h b/sys/sys/khelp.h
index 54c4791d3be9..8e4e617eb6e7 100644
--- a/sys/sys/khelp.h
+++ b/sys/sys/khelp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index da8c2d5106bb..6f654a776971 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2003 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/kpilite.h b/sys/sys/kpilite.h
index 2a7e9743f799..5556d4548465 100644
--- a/sys/sys/kpilite.h
+++ b/sys/sys/kpilite.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy <mmacy@freebsd.org>
*
diff --git a/sys/sys/ksem.h b/sys/sys/ksem.h
index 4776901fd7b1..5a3941cd248b 100644
--- a/sys/sys/ksem.h
+++ b/sys/sys/ksem.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index e16fe3e1b446..afcad037a32b 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h
index 9fc01de5978c..8a2f2241854c 100644
--- a/sys/sys/ktls.h
+++ b/sys/sys/ktls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014-2019 Netflix Inc.
*
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 2d65630cd66b..df9d8d24f4b7 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997-2000 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index 7c12ae215018..d1bb1d89998c 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 John D. Polstra
* Copyright (c) 1999,2001 Peter Wemm <peter@FreeBSD.org>
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 4031f20946c0..161d11b2bc57 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
diff --git a/sys/sys/lock_profile.h b/sys/sys/lock_profile.h
index de1a95779254..4b3efff4b46f 100644
--- a/sys/sys/lock_profile.h
+++ b/sys/sys/lock_profile.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Kip Macy kmacy@FreeBSD.org
* Copyright (c) 2006 Kris Kennaway kris@FreeBSD.org
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index fc3046f8c85a..2fc0b561668e 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/lockstat.h b/sys/sys/lockstat.h
index 76bd97dbafa5..a336fe01c5a5 100644
--- a/sys/sys/lockstat.h
+++ b/sys/sys/lockstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org>
*
diff --git a/sys/sys/loginclass.h b/sys/sys/loginclass.h
index c07a2d92dad6..13e48b87c592 100644
--- a/sys/sys/loginclass.h
+++ b/sys/sys/loginclass.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The FreeBSD Foundation
*
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index bc12cb753083..d4e8acf576b8 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2002 Robert N. M. Watson
* Copyright (c) 2001-2005 Networks Associates Technology, Inc.
diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index 28391d749472..fd06639081d8 100644
--- a/sys/sys/mchain.h
+++ b/sys/sys/mchain.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Boris Popov
* All rights reserved.
diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h
index 8a128fd7f519..68dc83d03ef0 100644
--- a/sys/sys/memdesc.h
+++ b/sys/sys/memdesc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 EMC Corp.
* All rights reserved.
diff --git a/sys/sys/module.h b/sys/sys/module.h
index efefaf4cb513..623c67977636 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/module_khelp.h b/sys/sys/module_khelp.h
index bab33e487497..692f7b3b192a 100644
--- a/sys/sys/module_khelp.h
+++ b/sys/sys/module_khelp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
diff --git a/sys/sys/mqueue.h b/sys/sys/mqueue.h
index ca9fd13cca76..47cc0e3b1eb8 100644
--- a/sys/sys/mqueue.h
+++ b/sys/sys/mqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/osd.h b/sys/sys/osd.h
index a9824184c579..0c3b8966f300 100644
--- a/sys/sys/osd.h
+++ b/sys/sys/osd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h
index 16635a884ca3..24c609f41e6d 100644
--- a/sys/sys/pciio.h
+++ b/sys/sys/pciio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@FreeBSD.ORG>
* Copyright (c) 1997, 1998, 1999, Kenneth D. Merry <ken@FreeBSD.ORG>
diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h
index 5cf740b25d7a..1968cb521fd6 100644
--- a/sys/sys/pctrie.h
+++ b/sys/sys/pctrie.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/sys/physmem.h b/sys/sys/physmem.h
index f9ba69228c95..9c5be8ecb38b 100644
--- a/sys/sys/physmem.h
+++ b/sys/sys/physmem.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/pidctrl.h b/sys/sys/pidctrl.h
index e09202e871d7..0771d0cd5963 100644
--- a/sys/sys/pidctrl.h
+++ b/sys/sys/pidctrl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 153d24ca250f..0c0b3150de9f 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/sys/pmckern.h b/sys/sys/pmckern.h
index 5b337f8d76df..7012b0bc9de4 100644
--- a/sys/sys/pmckern.h
+++ b/sys/sys/pmckern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/sys/pmclog.h b/sys/sys/pmclog.h
index 0ee9b7e2e853..0ce2a29263bf 100644
--- a/sys/sys/pmclog.h
+++ b/sys/sys/pmclog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/sys/sys/power.h b/sys/sys/power.h
index 524bc3fabb24..ea013b3b5168 100644
--- a/sys/sys/power.h
+++ b/sys/sys/power.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/sys/priv.h b/sys/sys/priv.h
index 8522231a2863..4dd1838880f1 100644
--- a/sys/sys/priv.h
+++ b/sys/sys/priv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 nCircle Network Security, Inc.
* All rights reserved.
diff --git a/sys/sys/procctl.h b/sys/sys/procctl.h
index 2d4b19325bbf..3d6e9e6f5acc 100644
--- a/sys/sys/procctl.h
+++ b/sys/sys/procctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hudson River Trading LLC
* Copyright (c) 2014, 2016 The FreeBSD Foundation
diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h
index b307917c5479..d47c7591580e 100644
--- a/sys/sys/procdesc.h
+++ b/sys/sys/procdesc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index 85e718b20c35..334ad8a7a004 100644
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 John D. Polstra.
* All rights reserved.
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index 1c5aad22197b..706a12daf357 100644
--- a/sys/sys/ptio.h
+++ b/sys/sys/ptio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Kenneth D. Merry.
* All rights reserved.
diff --git a/sys/sys/racct.h b/sys/sys/racct.h
index 49e0ce64069e..051191bc7315 100644
--- a/sys/sys/racct.h
+++ b/sys/sys/racct.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 2786cfad4b8f..f47bcbc58085 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2015, 2017 Mark R. V. Murray
* All rights reserved.
diff --git a/sys/sys/rangelock.h b/sys/sys/rangelock.h
index 128a87918f4f..762773c76a75 100644
--- a/sys/sys/rangelock.h
+++ b/sys/sys/rangelock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/rangeset.h b/sys/sys/rangeset.h
index 58dded5d37e2..5fcbc63e8240 100644
--- a/sys/sys/rangeset.h
+++ b/sys/sys/rangeset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/sys/sys/rctl.h b/sys/sys/rctl.h
index 292bc3f9aa6b..692897cc7cf9 100644
--- a/sys/sys/rctl.h
+++ b/sys/sys/rctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h
index c320316a8e87..8ebb52b2e7c0 100644
--- a/sys/sys/refcount.h
+++ b/sys/sys/refcount.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/sys/reg.h b/sys/sys/reg.h
index 97803498e2a0..f6e3a396100d 100644
--- a/sys/sys/reg.h
+++ b/sys/sys/reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2014,2019 Andrew Turner
* Copyright (c) 2014-2015 The FreeBSD Foundation
diff --git a/sys/sys/regression.h b/sys/sys/regression.h
index 1ce711faa35f..3a94e3107e7e 100644
--- a/sys/sys/regression.h
+++ b/sys/sys/regression.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/sys/runq.h b/sys/sys/runq.h
index 0e3113b1102f..5dc30acb62fb 100644
--- a/sys/sys/runq.h
+++ b/sys/sys/runq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/rwlock.h b/sys/sys/rwlock.h
index 4e7768595737..61d90fde49d6 100644
--- a/sys/sys/rwlock.h
+++ b/sys/sys/rwlock.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index d87e3917b84c..db0fb9a24ae6 100644
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2008 Poul-Henning Kamp
* Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
index 8041a2bc12d4..4b5c7814d919 100644
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD)
+ * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause)
*
* Copyright (c) 1996, 1997
* HD Associates, Inc. All rights reserved.
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index fb5c3d671604..82b5c4ebf0fc 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
*
diff --git a/sys/sys/sema.h b/sys/sys/sema.h
index 3b91c921c46a..2c0ef3c1acc0 100644
--- a/sys/sys/sema.h
+++ b/sys/sys/sema.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
*
diff --git a/sys/sys/serial.h b/sys/sys/serial.h
index 804687d31271..0d6687f01a48 100644
--- a/sys/sys/serial.h
+++ b/sys/sys/serial.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/sys/sf_buf.h b/sys/sys/sf_buf.h
index b4ea671a2d23..e8aed573a07c 100644
--- a/sys/sys/sf_buf.h
+++ b/sys/sys/sf_buf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 2003-2004 Alan L. Cox <alc@cs.rice.edu>
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
index 6715894ed1f3..abd065312aef 100644
--- a/sys/sys/sleepqueue.h
+++ b/sys/sys/sleepqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/sys/slicer.h b/sys/sys/slicer.h
index 675b5acc2dd7..251192339c69 100644
--- a/sys/sys/slicer.h
+++ b/sys/sys/slicer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Semihalf.
* All rights reserved.
diff --git a/sys/sys/smr.h b/sys/sys/smr.h
index 2b6dbeb998da..d049d780e385 100644
--- a/sys/sys/smr.h
+++ b/sys/sys/smr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, 2020 Jeffrey Roberson <jeff@FreeBSD.org>
*
diff --git a/sys/sys/smr_types.h b/sys/sys/smr_types.h
index 3497f21af846..3f167a980497 100644
--- a/sys/sys/smr_types.h
+++ b/sys/sys/smr_types.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, 2020 Jeffrey Roberson <jeff@FreeBSD.org>
*
diff --git a/sys/sys/specialfd.h b/sys/sys/specialfd.h
index c388bdcb7b6f..3e3f89ee7b8b 100644
--- a/sys/sys/specialfd.h
+++ b/sys/sys/specialfd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Greg V
*
diff --git a/sys/sys/spigenio.h b/sys/sys/spigenio.h
index 6ad9b01b634a..05441832c4b8 100644
--- a/sys/sys/spigenio.h
+++ b/sys/sys/spigenio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/stack.h b/sys/sys/stack.h
index acaa2f36bc00..cd7a145e51d6 100644
--- a/sys/sys/stack.h
+++ b/sys/sys/stack.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h
index f4fd1c6ae60e..fb536e44d50e 100644
--- a/sys/sys/stdatomic.h
+++ b/sys/sys/stdatomic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
* David Chisnall <theraven@FreeBSD.org>
diff --git a/sys/sys/stddef.h b/sys/sys/stddef.h
index eeff767bbf20..619e84aa9616 100644
--- a/sys/sys/stddef.h
+++ b/sys/sys/stddef.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h
index e951ac3c5df8..c3b12792dc2d 100644
--- a/sys/sys/stdint.h
+++ b/sys/sys/stdint.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/sx.h b/sys/sys/sx.h
index 1e6b9f3f8a46..573d18312ef0 100644
--- a/sys/sys/sx.h
+++ b/sys/sys/sx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index fb7bbe58a63a..fc61d2119540 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Ian Dowse. All rights reserved.
*
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index cc98fe5fab85..119e9dcc99c1 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
diff --git a/sys/sys/terminal.h b/sys/sys/terminal.h
index 7a6ee7530294..f6904ab31e78 100644
--- a/sys/sys/terminal.h
+++ b/sys/sys/terminal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 The FreeBSD Foundation
*
diff --git a/sys/sys/thr.h b/sys/sys/thr.h
index c00b8b25a9f4..a315296a955d 100644
--- a/sys/sys/thr.h
+++ b/sys/sys/thr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index acda7741d0b7..8eb6aa3aa8ca 100644
--- a/sys/sys/tiio.h
+++ b/sys/sys/tiio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-4-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-4-Clause)
*
* Copyright (c) 1999, 2000 Kenneth D. Merry.
* All rights reserved.
diff --git a/sys/sys/timeet.h b/sys/sys/timeet.h
index a809106b2369..cc4f953fa4bb 100644
--- a/sys/sys/timeet.h
+++ b/sys/sys/timeet.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/timeffc.h b/sys/sys/timeffc.h
index 493a212b3f96..ed3190b213a4 100644
--- a/sys/sys/timeffc.h
+++ b/sys/sys/timeffc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index d6408c045913..83326b31041d 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -3,7 +3,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index f25dc3ca5e8b..52fbe9e34474 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/ttydevsw.h b/sys/sys/ttydevsw.h
index d6b544e80323..59f2378daded 100644
--- a/sys/sys/ttydevsw.h
+++ b/sys/sys/ttydevsw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/ttydisc.h b/sys/sys/ttydisc.h
index 295a92c36842..2621946d9fe9 100644
--- a/sys/sys/ttydisc.h
+++ b/sys/sys/ttydisc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/ttyhook.h b/sys/sys/ttyhook.h
index e4bd7ac53d1b..59fbb7aa4188 100644
--- a/sys/sys/ttyhook.h
+++ b/sys/sys/ttyhook.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/ttyqueue.h b/sys/sys/ttyqueue.h
index c1ddaa42b41b..cb2136def022 100644
--- a/sys/sys/ttyqueue.h
+++ b/sys/sys/ttyqueue.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/sys/turnstile.h b/sys/sys/turnstile.h
index c74d069041ce..9a69cf0cbdda 100644
--- a/sys/sys/turnstile.h
+++ b/sys/sys/turnstile.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h
index ddd3bd387099..01c81d03096a 100644
--- a/sys/sys/umtx.h
+++ b/sys/sys/umtx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/umtxvar.h b/sys/sys/umtxvar.h
index b6d89b6b8559..2be575f287b9 100644
--- a/sys/sys/umtxvar.h
+++ b/sys/sys/umtxvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/sys/uuid.h b/sys/sys/uuid.h
index bbb85732dd50..2d41a7074049 100644
--- a/sys/sys/uuid.h
+++ b/sys/sys/uuid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/sys/vdso.h b/sys/sys/vdso.h
index a98e3e9ebabe..0bca6041675d 100644
--- a/sys/sys/vdso.h
+++ b/sys/sys/vdso.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
diff --git a/sys/sys/vmem.h b/sys/sys/vmem.h
index e74d1e3fe803..c1f18a03fa6f 100644
--- a/sys/sys/vmem.h
+++ b/sys/sys/vmem.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c)2006 YAMAMOTO Takashi,
* All rights reserved.
diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h
index 3728d742e4d1..7403f854ec3a 100644
--- a/sys/sys/watchdog.h
+++ b/sys/sys/watchdog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 2013 iXsystems.com,
diff --git a/sys/teken/demo/teken_demo.c b/sys/teken/demo/teken_demo.c
index 167e150851f6..d7edd3655cd6 100644
--- a/sys/teken/demo/teken_demo.c
+++ b/sys/teken/demo/teken_demo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/teken/stress/teken_stress.c b/sys/teken/stress/teken_stress.c
index a8ebfa890e6b..7319da0f437d 100644
--- a/sys/teken/stress/teken_stress.c
+++ b/sys/teken/stress/teken_stress.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/teken/teken.c b/sys/teken/teken.c
index 590e992fb238..58656924a6ca 100644
--- a/sys/teken/teken.c
+++ b/sys/teken/teken.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/teken/teken.h b/sys/teken/teken.h
index 7545db9b9cdf..5c2d892eb4c2 100644
--- a/sys/teken/teken.h
+++ b/sys/teken/teken.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/teken/teken_scs.h b/sys/teken/teken_scs.h
index f17d6e5e28c2..80a2d22242b6 100644
--- a/sys/teken/teken_scs.h
+++ b/sys/teken/teken_scs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/teken/teken_subr.h b/sys/teken/teken_subr.h
index 8db1c024b310..2462702a30cc 100644
--- a/sys/teken/teken_subr.h
+++ b/sys/teken/teken_subr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/teken/teken_subr_compat.h b/sys/teken/teken_subr_compat.h
index c71fcea6ce9f..6075ba40b95f 100644
--- a/sys/teken/teken_subr_compat.h
+++ b/sys/teken/teken_subr_compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/sys/tests/fib_lookup/fib_lookup.c b/sys/tests/fib_lookup/fib_lookup.c
index 975644607409..ca3c27aa70c3 100644
--- a/sys/tests/fib_lookup/fib_lookup.c
+++ b/sys/tests/fib_lookup/fib_lookup.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/sys/tests/runtest/runtest.c b/sys/tests/runtest/runtest.c
index 96440673adc4..3396f6b838f3 100644
--- a/sys/tests/runtest/runtest.c
+++ b/sys/tests/runtest/runtest.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Mellanox Technologies. All rights reserved.
*
diff --git a/sys/tools/acpi_quirks2h.awk b/sys/tools/acpi_quirks2h.awk
index 51b21cc2bbe2..eba42dc06e2a 100644
--- a/sys/tools/acpi_quirks2h.awk
+++ b/sys/tools/acpi_quirks2h.awk
@@ -3,7 +3,7 @@
# $FreeBSD$
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2004 Mark Santcroos <marks@ripe.net>
# All rights reserved.
diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh
index 6198ca8c6ffa..e64c964219c3 100644
--- a/sys/tools/amd64_ia32_vdso.sh
+++ b/sys/tools/amd64_ia32_vdso.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 The FreeBSD Foundation
# All rights reserved.
diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh
index c6fec72b8bbd..1a0203e3e0a4 100644
--- a/sys/tools/amd64_vdso.sh
+++ b/sys/tools/amd64_vdso.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 The FreeBSD Foundation
# All rights reserved.
diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk
index cda56e2225cd..33081365b5d1 100644
--- a/sys/tools/arm_kernel_boothdr.awk
+++ b/sys/tools/arm_kernel_boothdr.awk
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2019 Ian Lepore <ian@freebsd.org>
#
diff --git a/sys/tools/bus_macro.sh b/sys/tools/bus_macro.sh
index 6a75e31367dc..3f7660376d8d 100644
--- a/sys/tools/bus_macro.sh
+++ b/sys/tools/bus_macro.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2004-2005 Poul-Henning Kamp.
# All rights reserved.
diff --git a/sys/tools/embed_mfs.sh b/sys/tools/embed_mfs.sh
index 072f7818906e..105abeb89cd6 100644
--- a/sys/tools/embed_mfs.sh
+++ b/sys/tools/embed_mfs.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (C) 2008 The FreeBSD Project. All rights reserved.
#
diff --git a/sys/tools/fdt/embed_dtb.sh b/sys/tools/fdt/embed_dtb.sh
index f6daf799a088..edcaf3f29244 100755
--- a/sys/tools/fdt/embed_dtb.sh
+++ b/sys/tools/fdt/embed_dtb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2010 The FreeBSD Foundation
#
diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk
index 1d01cf1f2c29..c769c0a5721d 100644
--- a/sys/tools/fw_stub.awk
+++ b/sys/tools/fw_stub.awk
@@ -1,7 +1,7 @@
#!/usr/bin/awk -f
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2006 Max Laier.
# All rights reserved.
diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua
index dba9488b11a8..67a51c946d4e 100644
--- a/sys/tools/makesyscalls.lua
+++ b/sys/tools/makesyscalls.lua
@@ -1,5 +1,5 @@
--
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
--
diff --git a/sys/tools/sound/feeder_eq_mkfilter.awk b/sys/tools/sound/feeder_eq_mkfilter.awk
index f956ffe1d082..1dbc92704927 100644
--- a/sys/tools/sound/feeder_eq_mkfilter.awk
+++ b/sys/tools/sound/feeder_eq_mkfilter.awk
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
# All rights reserved.
diff --git a/sys/tools/sound/feeder_rate_mkfilter.awk b/sys/tools/sound/feeder_rate_mkfilter.awk
index 264bec4d47f2..a713a814d340 100644
--- a/sys/tools/sound/feeder_rate_mkfilter.awk
+++ b/sys/tools/sound/feeder_rate_mkfilter.awk
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
# All rights reserved.
diff --git a/sys/tools/sound/snd_fxdiv_gen.awk b/sys/tools/sound/snd_fxdiv_gen.awk
index 9939e562ff32..65ae1aab7cea 100644
--- a/sys/tools/sound/snd_fxdiv_gen.awk
+++ b/sys/tools/sound/snd_fxdiv_gen.awk
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2008-2009 Ariff Abdullah <ariff@FreeBSD.org>
# All rights reserved.
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 195ba9f8a299..957be753ce15 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-3-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-3-Clause)
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index af20258081d5..bf0692eca4cf 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-3-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-3-Clause)
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c
index 41a1b7843e58..2c1e6bf2b8d2 100644
--- a/sys/ufs/ffs/ffs_rawread.c
+++ b/sys/ufs/ffs/ffs_rawread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2003 Tor Egge
* All rights reserved.
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index a23f0ad502a9..907ccb9558be 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
*
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index c86ae35ee8c5..75dd5d7e5a5a 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1998, 2000 Marshall Kirk McKusick.
* Copyright 2009, 2010 Jeffrey W. Roberson <jeff@FreeBSD.org>
diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c
index 5e3258089fd0..fcb211711282 100644
--- a/sys/ufs/ffs/ffs_suspend.c
+++ b/sys/ufs/ffs/ffs_suspend.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index bfba15a55872..fbc4a5e07459 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-3-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-3-Clause)
*
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index 41728be3ec0f..e45abb9def32 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
*
diff --git a/sys/ufs/ufs/acl.h b/sys/ufs/ufs/acl.h
index 12da6d480416..be2cf1c73138 100644
--- a/sys/ufs/ufs/acl.h
+++ b/sys/ufs/ufs/acl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index e4a424abe2e6..dd3ada0f90b8 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-3-Clause)
+ * SPDX-License-Identifier: (BSD-2-Clause AND BSD-3-Clause)
*
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/sys/ufs/ufs/dirhash.h b/sys/ufs/ufs/dirhash.h
index 1f9097e58af3..241be2322f1e 100644
--- a/sys/ufs/ufs/dirhash.h
+++ b/sys/ufs/ufs/dirhash.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Ian Dowse. All rights reserved.
*
diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h
index 781cc782f415..0d55b4fe6a65 100644
--- a/sys/ufs/ufs/extattr.h
+++ b/sys/ufs/ufs/extattr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/ufs/ufs/gjournal.h b/sys/ufs/ufs/gjournal.h
index 228f827214a2..49633cc9891c 100644
--- a/sys/ufs/ufs/gjournal.h
+++ b/sys/ufs/ufs/gjournal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c
index c05fade2d645..e9035fa58866 100644
--- a/sys/ufs/ufs/ufs_acl.c
+++ b/sys/ufs/ufs/ufs_acl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2003 Robert N. M. Watson
* All rights reserved.
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index 955ddf7fc8bb..5a568451f03e 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001, 2002 Ian Dowse. All rights reserved.
*
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 3a88ad7b8279..1dd90b9e2e15 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2002 Robert N. M. Watson
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
diff --git a/sys/ufs/ufs/ufs_gjournal.c b/sys/ufs/ufs/ufs_gjournal.c
index a41dc7c04a88..d45e79fc4fd9 100644
--- a/sys/ufs/ufs/ufs_gjournal.c
+++ b/sys/ufs/ufs/ufs_gjournal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/vm/_vm_phys.h b/sys/vm/_vm_phys.h
index 3bca9aec7f59..87d263133370 100644
--- a/sys/vm/_vm_phys.h
+++ b/sys/vm/_vm_phys.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2006 Rice University
* Copyright (c) 2007 Alan L. Cox <alc@cs.rice.edu>
diff --git a/sys/vm/_vm_radix.h b/sys/vm/_vm_radix.h
index 4da54e897fff..77e364d1d238 100644
--- a/sys/vm/_vm_radix.h
+++ b/sys/vm/_vm_radix.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c
index bb6493ae5536..02db894808a6 100644
--- a/sys/vm/memguard.c
+++ b/sys/vm/memguard.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005, Bosko Milekic <bmilekic@FreeBSD.org>.
* Copyright (c) 2010 Isilon Systems, Inc. (http://www.isilon.com/)
diff --git a/sys/vm/memguard.h b/sys/vm/memguard.h
index d541a1bcda05..8c3ca1a7fe7a 100644
--- a/sys/vm/memguard.h
+++ b/sys/vm/memguard.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005,
* Bosko Milekic <bmilekic@FreeBSD.org>. All rights reserved.
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index 07ca6f0fc3de..340d0743742d 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Peter Wemm
*
diff --git a/sys/vm/redzone.c b/sys/vm/redzone.c
index 88e36c41b928..426c66e5baa4 100644
--- a/sys/vm/redzone.c
+++ b/sys/vm/redzone.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/vm/redzone.h b/sys/vm/redzone.h
index ce384dcaf771..60a663c67130 100644
--- a/sys/vm/redzone.h
+++ b/sys/vm/redzone.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
diff --git a/sys/vm/sg_pager.c b/sys/vm/sg_pager.c
index bb2e8f39e219..bfd87f5f49f9 100644
--- a/sys/vm/sg_pager.c
+++ b/sys/vm/sg_pager.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index dc8bd07d299e..6e38523b29be 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003, 2004, 2005 Jeffrey Roberson <jeff@FreeBSD.org>
* Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index e78142294ac9..852043ad0d23 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2019 Jeffrey Roberson <jeff@FreeBSD.org>
* Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c
index 06ce81efff2b..3b45bdb29e7e 100644
--- a/sys/vm/uma_dbg.c
+++ b/sys/vm/uma_dbg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003, 2004, 2005 Jeffrey Roberson <jeff@FreeBSD.org>
* Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
diff --git a/sys/vm/uma_dbg.h b/sys/vm/uma_dbg.h
index c47273b6be44..8e8f74ad3252 100644
--- a/sys/vm/uma_dbg.h
+++ b/sys/vm/uma_dbg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003, 2004, 2005 Jeffrey Roberson <jeff@FreeBSD.org>
* Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index d4b43a61f29e..70441572705e 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2019 Jeffrey Roberson <jeff@FreeBSD.org>
* Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c
index 748770c83449..8cdf05947f16 100644
--- a/sys/vm/vm_domainset.c
+++ b/sys/vm/vm_domainset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/vm/vm_domainset.h b/sys/vm/vm_domainset.h
index 6dceb6fe59c8..fa5c38fb4893 100644
--- a/sys/vm/vm_domainset.h
+++ b/sys/vm/vm_domainset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/sys/vm/vm_dumpset.h b/sys/vm/vm_dumpset.h
index aef056246d96..bab360ab0077 100644
--- a/sys/vm/vm_dumpset.h
+++ b/sys/vm/vm_dumpset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020, Scott Phillips <scottph@freebsd.org>
*
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
index 2b5a792fce6d..275e5657a23f 100644
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2006 Rice University
* Copyright (c) 2007 Alan L. Cox <alc@cs.rice.edu>
diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h
index 76c933d97914..a294bbaad80a 100644
--- a/sys/vm/vm_phys.h
+++ b/sys/vm/vm_phys.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2006 Rice University
* Copyright (c) 2007 Alan L. Cox <alc@cs.rice.edu>
diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c
index b53398ece77c..908bc4ec0bd1 100644
--- a/sys/vm/vm_radix.c
+++ b/sys/vm/vm_radix.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h
index be6ae33b8575..f38956ef305e 100644
--- a/sys/vm/vm_radix.h
+++ b/sys/vm/vm_radix.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c
index bb1bbe6680a1..eb3d4a8406d8 100644
--- a/sys/vm/vm_reserv.c
+++ b/sys/vm/vm_reserv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2006 Rice University
* Copyright (c) 2007-2011 Alan L. Cox <alc@cs.rice.edu>
diff --git a/sys/vm/vm_reserv.h b/sys/vm/vm_reserv.h
index 18377fb98cf1..975ac8e02b00 100644
--- a/sys/vm/vm_reserv.h
+++ b/sys/vm/vm_reserv.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2006 Rice University
* Copyright (c) 2007-2008 Alan L. Cox <alc@cs.rice.edu>
diff --git a/sys/x86/acpica/OsdEnvironment.c b/sys/x86/acpica/OsdEnvironment.c
index c9b22f25a28a..d5fdbad9e84f 100644
--- a/sys/x86/acpica/OsdEnvironment.c
+++ b/sys/x86/acpica/OsdEnvironment.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000,2001 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c
index 3435b85974e6..0487962f0b37 100644
--- a/sys/x86/acpica/acpi_apm.c
+++ b/sys/x86/acpica/acpi_apm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index 8e343a6619f3..12fac01ecd97 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/acpica/srat.c b/sys/x86/acpica/srat.c
index eecf3315a910..c31eb40fb0b5 100644
--- a/sys/x86/acpica/srat.c
+++ b/sys/x86/acpica/srat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/x86/bios/vpd.c b/sys/x86/bios/vpd.c
index 195c6a57f094..e363f670ee99 100644
--- a/sys/x86/bios/vpd.c
+++ b/sys/x86/bios/vpd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c
index cdca2fdfec5f..fbfef5230dba 100644
--- a/sys/x86/cpufreq/est.c
+++ b/sys/x86/cpufreq/est.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Colin Percival
* Copyright (c) 2005 Nate Lawson
diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c
index 3760b40ad397..b70797f5c532 100644
--- a/sys/x86/cpufreq/hwpstate_amd.c
+++ b/sys/x86/cpufreq/hwpstate_amd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Nate Lawson
* Copyright (c) 2004 Colin Percival
diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c
index ae63cc6a6efe..e30dc90a670c 100644
--- a/sys/x86/cpufreq/hwpstate_intel.c
+++ b/sys/x86/cpufreq/hwpstate_intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Intel Corporation
*
diff --git a/sys/x86/cpufreq/hwpstate_intel_internal.h b/sys/x86/cpufreq/hwpstate_intel_internal.h
index ec038704edab..d3cbac9b6a64 100644
--- a/sys/x86/cpufreq/hwpstate_intel_internal.h
+++ b/sys/x86/cpufreq/hwpstate_intel_internal.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Intel Corporation
*
diff --git a/sys/x86/cpufreq/p4tcc.c b/sys/x86/cpufreq/p4tcc.c
index 4370da81cf06..b8dc70a14433 100644
--- a/sys/x86/cpufreq/p4tcc.c
+++ b/sys/x86/cpufreq/p4tcc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Nate Lawson
* All rights reserved.
diff --git a/sys/x86/cpufreq/powernow.c b/sys/x86/cpufreq/powernow.c
index 977798ab2f77..db5aff804967 100644
--- a/sys/x86/cpufreq/powernow.c
+++ b/sys/x86/cpufreq/powernow.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Bruno Ducrot
* Copyright (c) 2004 FUKUDA Nobuhiko <nfukuda@spa.is.uec.ac.jp>
diff --git a/sys/x86/cpufreq/smist.c b/sys/x86/cpufreq/smist.c
index 129ec2d4884b..0291fe299574 100644
--- a/sys/x86/cpufreq/smist.c
+++ b/sys/x86/cpufreq/smist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Bruno Ducrot
*
diff --git a/sys/x86/include/acpica_machdep.h b/sys/x86/include/acpica_machdep.h
index d6694be9c373..8a75c9789787 100644
--- a/sys/x86/include/acpica_machdep.h
+++ b/sys/x86/include/acpica_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Mitsuru IWASAKI
* All rights reserved.
diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h
index fb8b3b92e658..0d91ed76c890 100644
--- a/sys/x86/include/apicreg.h
+++ b/sys/x86/include/apicreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, by Peter Wemm and Steve Passe
* All rights reserved.
diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h
index fbc2d58cae04..f3008d540b4b 100644
--- a/sys/x86/include/apicvar.h
+++ b/sys/x86/include/apicvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h
index c48d98ddfe71..85009ac264c9 100644
--- a/sys/x86/include/busdma_impl.h
+++ b/sys/x86/include/busdma_impl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h
index 7b2825579e65..98e07d19269e 100644
--- a/sys/x86/include/elf.h
+++ b/sys/x86/include/elf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996-1997 John D. Polstra.
* All rights reserved.
diff --git a/sys/x86/include/fdt.h b/sys/x86/include/fdt.h
index 6db967d17d73..fdd86fa41f58 100644
--- a/sys/x86/include/fdt.h
+++ b/sys/x86/include/fdt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/x86/include/init.h b/sys/x86/include/init.h
index 880cabaa9496..f1fe4e9e740e 100644
--- a/sys/x86/include/init.h
+++ b/sys/x86/include/init.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
diff --git a/sys/x86/include/intr_machdep.h b/sys/x86/include/intr_machdep.h
index 346a33a40b79..933552c7dd7e 100644
--- a/sys/x86/include/intr_machdep.h
+++ b/sys/x86/include/intr_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/include/kvm.h b/sys/x86/include/kvm.h
index beec6447d7d6..724c4eabab55 100644
--- a/sys/x86/include/kvm.h
+++ b/sys/x86/include/kvm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Bryan Venteicher <bryanv@FreeBSD.org>
* Copyright (c) 2021 Mathieu Chouquet-Stringer
diff --git a/sys/x86/include/legacyvar.h b/sys/x86/include/legacyvar.h
index f6e5814a3f97..17d1144c580e 100644
--- a/sys/x86/include/legacyvar.h
+++ b/sys/x86/include/legacyvar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
diff --git a/sys/x86/include/mca.h b/sys/x86/include/mca.h
index 9e582d413885..d2cde8e6e393 100644
--- a/sys/x86/include/mca.h
+++ b/sys/x86/include/mca.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/x86/include/mptable.h b/sys/x86/include/mptable.h
index 93b87181b15a..7d5c38f4a9f3 100644
--- a/sys/x86/include/mptable.h
+++ b/sys/x86/include/mptable.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
diff --git a/sys/x86/include/ofw_machdep.h b/sys/x86/include/ofw_machdep.h
index 69e1b98e1de7..eadf363d5e16 100644
--- a/sys/x86/include/ofw_machdep.h
+++ b/sys/x86/include/ofw_machdep.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/x86/include/pci_cfgreg.h b/sys/x86/include/pci_cfgreg.h
index 85d6485c47ed..b32ccb95370b 100644
--- a/sys/x86/include/pci_cfgreg.h
+++ b/sys/x86/include/pci_cfgreg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
diff --git a/sys/x86/include/procctl.h b/sys/x86/include/procctl.h
index eb9a1e2c6ad1..1d1809c0af97 100644
--- a/sys/x86/include/procctl.h
+++ b/sys/x86/include/procctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019,2020 The FreeBSD Foundation
*
diff --git a/sys/x86/include/tls.h b/sys/x86/include/tls.h
index d4b631de10d0..4b6b58b4a5e3 100644
--- a/sys/x86/include/tls.h
+++ b/sys/x86/include/tls.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2003 David Xu <davidxu@freebsd.org>
* Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
diff --git a/sys/x86/include/ucode.h b/sys/x86/include/ucode.h
index 5c8868108930..9be308021aa5 100644
--- a/sys/x86/include/ucode.h
+++ b/sys/x86/include/ucode.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/x86/include/vdso.h b/sys/x86/include/vdso.h
index ace63cbe9f62..546a92a47301 100644
--- a/sys/x86/include/vdso.h
+++ b/sys/x86/include/vdso.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* Copyright 2016 The FreeBSD Foundation.
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index a51f799ccbd8..6f17f2fc646a 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index 9fc6ac436677..165fcbf46d89 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2015 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 61da86c098fc..7387a53cbbbc 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2015 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c
index af8474f41692..0e709de609c8 100644
--- a/sys/x86/iommu/intel_fault.c
+++ b/sys/x86/iommu/intel_fault.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
index be421fee7aa9..25ce7a2e8c2b 100644
--- a/sys/x86/iommu/intel_idpgtbl.c
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
index baaf5b472a2c..53f417702c72 100644
--- a/sys/x86/iommu/intel_qi.c
+++ b/sys/x86/iommu/intel_qi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c
index f75857911416..bf5f4ce3773a 100644
--- a/sys/x86/iommu/intel_quirks.c
+++ b/sys/x86/iommu/intel_quirks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013, 2015 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_reg.h b/sys/x86/iommu/intel_reg.h
index d8e1bbc82db3..d6b13fd62f4c 100644
--- a/sys/x86/iommu/intel_reg.h
+++ b/sys/x86/iommu/intel_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013-2015 The FreeBSD Foundation
*
diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c
index 315ffc8d4160..718c37b5f28b 100644
--- a/sys/x86/iommu/intel_utils.c
+++ b/sys/x86/iommu/intel_utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 The FreeBSD Foundation
*
diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index a98fb8b9d716..84cdb6da8d65 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c
index 167e7cfbf8fd..24c437593717 100644
--- a/sys/x86/isa/atrtc.c
+++ b/sys/x86/isa/atrtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Poul-Henning Kamp
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
diff --git a/sys/x86/isa/elcr.c b/sys/x86/isa/elcr.c
index 7f2b90986d13..1db64c2dd7d0 100644
--- a/sys/x86/isa/elcr.c
+++ b/sys/x86/isa/elcr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c
index 49402b44ffba..ac2225348ce4 100644
--- a/sys/x86/isa/isa.c
+++ b/sys/x86/isa/isa.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND ISC)
+ * SPDX-License-Identifier: (BSD-2-Clause AND ISC)
*
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
diff --git a/sys/x86/isa/orm.c b/sys/x86/isa/orm.c
index 6c16a8f63b27..a67803e4c55b 100644
--- a/sys/x86/isa/orm.c
+++ b/sys/x86/isa/orm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Nikolai Saoukh
* All rights reserved.
diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c
index 92905600742e..3440049c54b9 100644
--- a/sys/x86/linux/linux_dummy_x86.c
+++ b/sys/x86/linux/linux_dummy_x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/x86/linux/linux_vdso_getcpu_x86.inc b/sys/x86/linux/linux_vdso_getcpu_x86.inc
index 6cd0e5e78919..e26be602cb48 100644
--- a/sys/x86/linux/linux_vdso_getcpu_x86.inc
+++ b/sys/x86/linux/linux_vdso_getcpu_x86.inc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
* Copyright (c) 2022 Dmitry Chagin <dchagin@FreeBSD.org>
diff --git a/sys/x86/linux/linux_vdso_gettc_x86.inc b/sys/x86/linux/linux_vdso_gettc_x86.inc
index 11c2a531e97e..573ccad5024c 100644
--- a/sys/x86/linux/linux_vdso_gettc_x86.inc
+++ b/sys/x86/linux/linux_vdso_gettc_x86.inc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* Copyright (c) 2016, 2017, 2019 The FreeBSD Foundation
diff --git a/sys/x86/linux/linux_x86.c b/sys/x86/linux/linux_x86.c
index 2f4658106621..34ae66ec4954 100644
--- a/sys/x86/linux/linux_x86.c
+++ b/sys/x86/linux/linux_x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
diff --git a/sys/x86/linux/linux_x86.h b/sys/x86/linux/linux_x86.h
index ce083bb1c3f5..2763b60f1649 100644
--- a/sys/x86/linux/linux_x86.h
+++ b/sys/x86/linux/linux_x86.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c
index 0487c8475f43..500f14aefdbe 100644
--- a/sys/x86/pci/pci_bus.c
+++ b/sys/x86/pci/pci_bus.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
diff --git a/sys/x86/pci/pci_early_quirks.c b/sys/x86/pci/pci_early_quirks.c
index 29788cdd19d4..8b3a9594ee6f 100644
--- a/sys/x86/pci/pci_early_quirks.c
+++ b/sys/x86/pci/pci_early_quirks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Johannes Lundberg
*
diff --git a/sys/x86/pci/qpi.c b/sys/x86/pci/qpi.c
index f567d680ad96..4910dd524276 100644
--- a/sys/x86/pci/qpi.c
+++ b/sys/x86/pci/qpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c
index cfe4dc862d19..030360b1f1c2 100644
--- a/sys/x86/x86/busdma_bounce.c
+++ b/sys/x86/x86/busdma_bounce.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c
index ae62f83ea300..c75e2c997159 100644
--- a/sys/x86/x86/busdma_machdep.c
+++ b/sys/x86/x86/busdma_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* Copyright (c) 2013 The FreeBSD Foundation
diff --git a/sys/x86/x86/dump_machdep.c b/sys/x86/x86/dump_machdep.c
index 006b59898bdc..6798b23146ae 100644
--- a/sys/x86/x86/dump_machdep.c
+++ b/sys/x86/x86/dump_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
diff --git a/sys/x86/x86/fdt_machdep.c b/sys/x86/x86/fdt_machdep.c
index c120a90710a9..cfc7cf7b474e 100644
--- a/sys/x86/x86/fdt_machdep.c
+++ b/sys/x86/x86/fdt_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Juniper Networks, Inc.
* All rights reserved.
diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
index 8f47450b17c3..6413d8aadd73 100644
--- a/sys/x86/x86/intr_machdep.c
+++ b/sys/x86/x86/intr_machdep.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c
index 444bcb87064e..680904c97afb 100644
--- a/sys/x86/x86/io_apic.c
+++ b/sys/x86/x86/io_apic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c
index 7aff3874ad1b..c343460d3e32 100644
--- a/sys/x86/x86/mca.c
+++ b/sys/x86/x86/mca.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c
index ec746b756b4f..29d6ec41c7e4 100644
--- a/sys/x86/x86/mptable.c
+++ b/sys/x86/x86/mptable.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c
index b1cd1feb1160..c2ef66f997fe 100644
--- a/sys/x86/x86/mptable_pci.c
+++ b/sys/x86/x86/mptable_pci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c
index 0dcee1967889..94305dfdc82f 100644
--- a/sys/x86/x86/tsc.c
+++ b/sys/x86/x86/tsc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998-2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c
index d8beeed68215..1f62c7f60f04 100644
--- a/sys/x86/x86/ucode.c
+++ b/sys/x86/x86/ucode.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
*
diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c
index 49051c702df7..135ad994da54 100644
--- a/sys/x86/xen/hvm.c
+++ b/sys/x86/xen/hvm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008, 2013 Citrix Systems, Inc.
* Copyright (c) 2012 Spectra Logic Corporation
diff --git a/sys/x86/xen/pvcpu_enum.c b/sys/x86/xen/pvcpu_enum.c
index 5d5c265fcc5f..5ed03cd81673 100644
--- a/sys/x86/xen/pvcpu_enum.c
+++ b/sys/x86/xen/pvcpu_enum.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
diff --git a/sys/xdr/xdr_mbuf.c b/sys/xdr/xdr_mbuf.c
index 0cd0b639da68..47388dac09bf 100644
--- a/sys/xdr/xdr_mbuf.c
+++ b/sys/xdr/xdr_mbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/sys/xen/xenbus/xenbusb.h b/sys/xen/xenbus/xenbusb.h
index 41e56ec51e30..12f5201f70eb 100644
--- a/sys/xen/xenbus/xenbusb.h
+++ b/sys/xen/xenbus/xenbusb.h
@@ -1,9 +1,9 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Core definitions and data structures shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Spectra Logic Corporation
* Copyright (C) 2008 Doug Rabson
diff --git a/sys/xen/xenstore/xenstore_internal.h b/sys/xen/xenstore/xenstore_internal.h
index 9463c5ddb5f5..4ad1e0880af5 100644
--- a/sys/xen/xenstore/xenstore_internal.h
+++ b/sys/xen/xenstore/xenstore_internal.h
@@ -1,7 +1,7 @@
/*-
* Core definitions and data structures shareable across OS platforms.
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Spectra Logic Corporation
* All rights reserved.
diff --git a/tests/sys/capsicum/functional.sh b/tests/sys/capsicum/functional.sh
index 0bd6b2d5e983..383d3ad6748e 100755
--- a/tests/sys/capsicum/functional.sh
+++ b/tests/sys/capsicum/functional.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 The FreeBSD Foundation
#
diff --git a/tests/sys/devrandom/uint128_test.c b/tests/sys/devrandom/uint128_test.c
index 288e8a2e9f79..d1a0502b5a36 100644
--- a/tests/sys/devrandom/uint128_test.c
+++ b/tests/sys/devrandom/uint128_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/tests/sys/fifo/fifo_kqueue.c b/tests/sys/fifo/fifo_kqueue.c
index c4bd402c8e96..410b389c5a41 100644
--- a/tests/sys/fifo/fifo_kqueue.c
+++ b/tests/sys/fifo/fifo_kqueue.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Jan Kokemüller
*
diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c
index 130acababb21..bd98d7a6955a 100644
--- a/tests/sys/file/path_test.c
+++ b/tests/sys/file/path_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/access.cc b/tests/sys/fs/fusefs/access.cc
index 0c3e3088b816..de1165480a4a 100644
--- a/tests/sys/fs/fusefs/access.cc
+++ b/tests/sys/fs/fusefs/access.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/allow_other.cc b/tests/sys/fs/fusefs/allow_other.cc
index 30488dbbb0eb..e791ca541b06 100644
--- a/tests/sys/fs/fusefs/allow_other.cc
+++ b/tests/sys/fs/fusefs/allow_other.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc
index 34392da0090a..9137567fcffd 100644
--- a/tests/sys/fs/fusefs/bad_server.cc
+++ b/tests/sys/fs/fusefs/bad_server.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Axcient
*
diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc
index 91d8ab563690..9d97d1c08ca5 100644
--- a/tests/sys/fs/fusefs/bmap.cc
+++ b/tests/sys/fs/fusefs/bmap.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/cache.cc b/tests/sys/fs/fusefs/cache.cc
index 4df262cecd0f..cf9476a0a853 100644
--- a/tests/sys/fs/fusefs/cache.cc
+++ b/tests/sys/fs/fusefs/cache.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alan Somers
*
diff --git a/tests/sys/fs/fusefs/copy_file_range.cc b/tests/sys/fs/fusefs/copy_file_range.cc
index 84101ca6c984..cf86398b4395 100644
--- a/tests/sys/fs/fusefs/copy_file_range.cc
+++ b/tests/sys/fs/fusefs/copy_file_range.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alan Somers
*
diff --git a/tests/sys/fs/fusefs/create.cc b/tests/sys/fs/fusefs/create.cc
index 9f5820a00b3a..2a376e0bcff9 100644
--- a/tests/sys/fs/fusefs/create.cc
+++ b/tests/sys/fs/fusefs/create.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/default_permissions.cc b/tests/sys/fs/fusefs/default_permissions.cc
index 0739ad48f1e2..6b27bf2cbd39 100644
--- a/tests/sys/fs/fusefs/default_permissions.cc
+++ b/tests/sys/fs/fusefs/default_permissions.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/default_permissions_privileged.cc b/tests/sys/fs/fusefs/default_permissions_privileged.cc
index 008dc5885a15..83a2b31e6ebb 100644
--- a/tests/sys/fs/fusefs/default_permissions_privileged.cc
+++ b/tests/sys/fs/fusefs/default_permissions_privileged.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/destroy.cc b/tests/sys/fs/fusefs/destroy.cc
index 91c22ba6975e..40be733b595b 100644
--- a/tests/sys/fs/fusefs/destroy.cc
+++ b/tests/sys/fs/fusefs/destroy.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/dev_fuse_poll.cc b/tests/sys/fs/fusefs/dev_fuse_poll.cc
index 5ac66a915ea5..de1b9a6b5f3f 100644
--- a/tests/sys/fs/fusefs/dev_fuse_poll.cc
+++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc
index 386a3ac746ea..a24a38ce6498 100644
--- a/tests/sys/fs/fusefs/fallocate.cc
+++ b/tests/sys/fs/fusefs/fallocate.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Alan Somers
*
diff --git a/tests/sys/fs/fusefs/fifo.cc b/tests/sys/fs/fusefs/fifo.cc
index bbaacb1285d6..edb7edb28266 100644
--- a/tests/sys/fs/fusefs/fifo.cc
+++ b/tests/sys/fs/fusefs/fifo.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/flush.cc b/tests/sys/fs/fusefs/flush.cc
index d31a9fdaa386..c9ea2edcf24d 100644
--- a/tests/sys/fs/fusefs/flush.cc
+++ b/tests/sys/fs/fusefs/flush.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/forget.cc b/tests/sys/fs/fusefs/forget.cc
index d520ba84dbdd..acb4a98d376e 100644
--- a/tests/sys/fs/fusefs/forget.cc
+++ b/tests/sys/fs/fusefs/forget.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/fsync.cc b/tests/sys/fs/fusefs/fsync.cc
index abac77626890..c0d7f7aefec0 100644
--- a/tests/sys/fs/fusefs/fsync.cc
+++ b/tests/sys/fs/fusefs/fsync.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/fsyncdir.cc b/tests/sys/fs/fusefs/fsyncdir.cc
index 80c70f9b84b2..249059f74ef9 100644
--- a/tests/sys/fs/fusefs/fsyncdir.cc
+++ b/tests/sys/fs/fusefs/fsyncdir.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/getattr.cc b/tests/sys/fs/fusefs/getattr.cc
index 6bca7e0af7c7..159e32464164 100644
--- a/tests/sys/fs/fusefs/getattr.cc
+++ b/tests/sys/fs/fusefs/getattr.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/interrupt.cc b/tests/sys/fs/fusefs/interrupt.cc
index 6893bea077e7..2a04733e4b03 100644
--- a/tests/sys/fs/fusefs/interrupt.cc
+++ b/tests/sys/fs/fusefs/interrupt.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc
index a8815434c6d8..d08dea99ff47 100644
--- a/tests/sys/fs/fusefs/io.cc
+++ b/tests/sys/fs/fusefs/io.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/last_local_modify.cc b/tests/sys/fs/fusefs/last_local_modify.cc
index ce2e155af49a..dd0d9c740355 100644
--- a/tests/sys/fs/fusefs/last_local_modify.cc
+++ b/tests/sys/fs/fusefs/last_local_modify.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Alan Somers
*
diff --git a/tests/sys/fs/fusefs/link.cc b/tests/sys/fs/fusefs/link.cc
index 789d3dcc3494..74403a466694 100644
--- a/tests/sys/fs/fusefs/link.cc
+++ b/tests/sys/fs/fusefs/link.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/locks.cc b/tests/sys/fs/fusefs/locks.cc
index c7c652dd573b..e3d0073e8498 100644
--- a/tests/sys/fs/fusefs/locks.cc
+++ b/tests/sys/fs/fusefs/locks.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/lookup.cc b/tests/sys/fs/fusefs/lookup.cc
index 7a5be84b48be..014aebb559ba 100644
--- a/tests/sys/fs/fusefs/lookup.cc
+++ b/tests/sys/fs/fusefs/lookup.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/lseek.cc b/tests/sys/fs/fusefs/lseek.cc
index 5ba176f0776d..dec2c4031b8c 100644
--- a/tests/sys/fs/fusefs/lseek.cc
+++ b/tests/sys/fs/fusefs/lseek.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alan Somers
*
diff --git a/tests/sys/fs/fusefs/mkdir.cc b/tests/sys/fs/fusefs/mkdir.cc
index f47189d9bf53..6defb64b27d8 100644
--- a/tests/sys/fs/fusefs/mkdir.cc
+++ b/tests/sys/fs/fusefs/mkdir.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc
index 75f7c2c46adc..7fed9d88dc92 100644
--- a/tests/sys/fs/fusefs/mknod.cc
+++ b/tests/sys/fs/fusefs/mknod.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc
index 43e8dd3b0371..fd6510ceeb48 100644
--- a/tests/sys/fs/fusefs/mockfs.cc
+++ b/tests/sys/fs/fusefs/mockfs.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh
index 51ed5ad72ee6..6280a8c67604 100644
--- a/tests/sys/fs/fusefs/mockfs.hh
+++ b/tests/sys/fs/fusefs/mockfs.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc
index 636545be74c2..06ebe7fedebc 100644
--- a/tests/sys/fs/fusefs/mount.cc
+++ b/tests/sys/fs/fusefs/mount.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/nfs.cc b/tests/sys/fs/fusefs/nfs.cc
index af90e2fb4623..891849277064 100644
--- a/tests/sys/fs/fusefs/nfs.cc
+++ b/tests/sys/fs/fusefs/nfs.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc
index d41018f60f01..76fb480db86a 100644
--- a/tests/sys/fs/fusefs/notify.cc
+++ b/tests/sys/fs/fusefs/notify.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/open.cc b/tests/sys/fs/fusefs/open.cc
index c1314fc0d02a..43cd07c1ddd7 100644
--- a/tests/sys/fs/fusefs/open.cc
+++ b/tests/sys/fs/fusefs/open.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/opendir.cc b/tests/sys/fs/fusefs/opendir.cc
index 365aa8dff9e2..754b690fb9ec 100644
--- a/tests/sys/fs/fusefs/opendir.cc
+++ b/tests/sys/fs/fusefs/opendir.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc
index 77f8731dc9f8..f1f485d0b736 100644
--- a/tests/sys/fs/fusefs/read.cc
+++ b/tests/sys/fs/fusefs/read.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/readdir.cc b/tests/sys/fs/fusefs/readdir.cc
index b6b807f350e9..63f291abbf42 100644
--- a/tests/sys/fs/fusefs/readdir.cc
+++ b/tests/sys/fs/fusefs/readdir.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/readlink.cc b/tests/sys/fs/fusefs/readlink.cc
index dfc7d5a59034..5efc01cfa4c2 100644
--- a/tests/sys/fs/fusefs/readlink.cc
+++ b/tests/sys/fs/fusefs/readlink.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/release.cc b/tests/sys/fs/fusefs/release.cc
index daa3ce39f573..a18b3db9f72c 100644
--- a/tests/sys/fs/fusefs/release.cc
+++ b/tests/sys/fs/fusefs/release.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/releasedir.cc b/tests/sys/fs/fusefs/releasedir.cc
index 50e70e9a9e5c..ee4338fcbd61 100644
--- a/tests/sys/fs/fusefs/releasedir.cc
+++ b/tests/sys/fs/fusefs/releasedir.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/rename.cc b/tests/sys/fs/fusefs/rename.cc
index 23d25c9965bf..6cd80159343f 100644
--- a/tests/sys/fs/fusefs/rename.cc
+++ b/tests/sys/fs/fusefs/rename.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/rmdir.cc b/tests/sys/fs/fusefs/rmdir.cc
index 2eec9568a2d3..fb8f3259e4e0 100644
--- a/tests/sys/fs/fusefs/rmdir.cc
+++ b/tests/sys/fs/fusefs/rmdir.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/setattr.cc b/tests/sys/fs/fusefs/setattr.cc
index e08f2124e06f..e7f60ce70c3a 100644
--- a/tests/sys/fs/fusefs/setattr.cc
+++ b/tests/sys/fs/fusefs/setattr.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/statfs.cc b/tests/sys/fs/fusefs/statfs.cc
index c6268c36cc47..97f8fad6178c 100644
--- a/tests/sys/fs/fusefs/statfs.cc
+++ b/tests/sys/fs/fusefs/statfs.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/symlink.cc b/tests/sys/fs/fusefs/symlink.cc
index bef06c90c3db..cbb9749b3954 100644
--- a/tests/sys/fs/fusefs/symlink.cc
+++ b/tests/sys/fs/fusefs/symlink.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/utils.cc b/tests/sys/fs/fusefs/utils.cc
index b13ecfd9cb88..1affde31e4aa 100644
--- a/tests/sys/fs/fusefs/utils.cc
+++ b/tests/sys/fs/fusefs/utils.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/utils.hh b/tests/sys/fs/fusefs/utils.hh
index d839dc6d2208..93468c5e1a91 100644
--- a/tests/sys/fs/fusefs/utils.hh
+++ b/tests/sys/fs/fusefs/utils.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc
index 800376395e97..a217e285a76b 100644
--- a/tests/sys/fs/fusefs/write.cc
+++ b/tests/sys/fs/fusefs/write.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/fs/fusefs/xattr.cc b/tests/sys/fs/fusefs/xattr.cc
index a83f51e35166..31382fb2fe91 100644
--- a/tests/sys/fs/fusefs/xattr.cc
+++ b/tests/sys/fs/fusefs/xattr.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation
*
diff --git a/tests/sys/geom/class/eli/misc_test.sh b/tests/sys/geom/class/eli/misc_test.sh
index 420f47f786e6..0b852d1e24d2 100644
--- a/tests/sys/geom/class/eli/misc_test.sh
+++ b/tests/sys/geom/class/eli/misc_test.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Alan Somers
#
diff --git a/tests/sys/geom/class/nop/nop_test.sh b/tests/sys/geom/class/nop/nop_test.sh
index 896ff7061347..e87b1d47b064 100644
--- a/tests/sys/geom/class/nop/nop_test.sh
+++ b/tests/sys/geom/class/nop/nop_test.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2016 Alan Somers
#
diff --git a/tests/sys/geom/class/part/misc.sh b/tests/sys/geom/class/part/misc.sh
index 944c9a298d6d..4cf505a22203 100644
--- a/tests/sys/geom/class/part/misc.sh
+++ b/tests/sys/geom/class/part/misc.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Alan Somers
#
diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c
index 023a25ffe5e6..bd348e10b262 100644
--- a/tests/sys/kern/fdgrowtable_test.c
+++ b/tests/sys/kern/fdgrowtable_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Rob Wing
*
diff --git a/tests/sys/kern/pipe/pipe_kqueue_test.c b/tests/sys/kern/pipe/pipe_kqueue_test.c
index 1d8100ac05f7..b184d84180a7 100644
--- a/tests/sys/kern/pipe/pipe_kqueue_test.c
+++ b/tests/sys/kern/pipe/pipe_kqueue_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Jan Kokemüller
*
diff --git a/tests/sys/kern/sendfile_test.sh b/tests/sys/kern/sendfile_test.sh
index 0bc575a4aaf4..e8b0d0ee3cf9 100755
--- a/tests/sys/kern/sendfile_test.sh
+++ b/tests/sys/kern/sendfile_test.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Netflix, Inc.
#
diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c
index 5041842f32b7..561577611353 100644
--- a/tests/sys/kern/socket_msg_trunc.c
+++ b/tests/sys/kern/socket_msg_trunc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Alexander V. Chernikov
*
diff --git a/tests/sys/kern/sys_getrandom.c b/tests/sys/kern/sys_getrandom.c
index d341ba89dde8..e6ef9c41fde6 100644
--- a/tests/sys/kern/sys_getrandom.c
+++ b/tests/sys/kern/sys_getrandom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Conrad Meyer <cem@FreeBSD.org>
* All rights reserved.
diff --git a/tests/sys/kern/sysctl_kern_proc.c b/tests/sys/kern/sysctl_kern_proc.c
index 5bab1eab5fba..99983f69014b 100644
--- a/tests/sys/kern/sysctl_kern_proc.c
+++ b/tests/sys/kern/sysctl_kern_proc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/tests/sys/kern/unix_socketpair_test.c b/tests/sys/kern/unix_socketpair_test.c
index 54327d921131..3ca9172f3585 100644
--- a/tests/sys/kern/unix_socketpair_test.c
+++ b/tests/sys/kern/unix_socketpair_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Alan Somers
*
diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh
index 5ddbff94385a..6419fe46deff 100755
--- a/tests/sys/net/if_bridge_test.sh
+++ b/tests/sys/net/if_bridge_test.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 The FreeBSD Foundation
#
diff --git a/tests/sys/net/if_epair_test.sh b/tests/sys/net/if_epair_test.sh
index 45b5552fb3c9..e1d0c0266b2d 100644
--- a/tests/sys/net/if_epair_test.sh
+++ b/tests/sys/net/if_epair_test.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2023 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/net/if_gif.sh b/tests/sys/net/if_gif.sh
index e4cf3722565a..ce1e16e5d135 100644
--- a/tests/sys/net/if_gif.sh
+++ b/tests/sys/net/if_gif.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/net/if_stf.sh b/tests/sys/net/if_stf.sh
index 693154122891..21184c869cdd 100644
--- a/tests/sys/net/if_stf.sh
+++ b/tests/sys/net/if_stf.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/net/if_wg.sh b/tests/sys/net/if_wg.sh
index ffa08a6a2dd6..f95bec54f335 100644
--- a/tests/sys/net/if_wg.sh
+++ b/tests/sys/net/if_wg.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 The FreeBSD Foundation
#
diff --git a/tests/sys/net/routing/params.h b/tests/sys/net/routing/params.h
index e17dc25cc922..40dccc98f4e3 100644
--- a/tests/sys/net/routing/params.h
+++ b/tests/sys/net/routing/params.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Alexander V. Chernikov
*
diff --git a/tests/sys/net/routing/rtsock_common.h b/tests/sys/net/routing/rtsock_common.h
index ae450ac88ba1..a3837b13b720 100644
--- a/tests/sys/net/routing/rtsock_common.h
+++ b/tests/sys/net/routing/rtsock_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Alexander V. Chernikov
*
diff --git a/tests/sys/net/routing/rtsock_config.h b/tests/sys/net/routing/rtsock_config.h
index d9eccb6a19f6..84d6d97f16ca 100644
--- a/tests/sys/net/routing/rtsock_config.h
+++ b/tests/sys/net/routing/rtsock_config.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Alexander V. Chernikov
*
diff --git a/tests/sys/net/routing/rtsock_print.h b/tests/sys/net/routing/rtsock_print.h
index 20bb1c51bc33..18da4401dcea 100644
--- a/tests/sys/net/routing/rtsock_print.h
+++ b/tests/sys/net/routing/rtsock_print.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Alexander V. Chernikov
*
diff --git a/tests/sys/net/routing/test_rtsock_l3.c b/tests/sys/net/routing/test_rtsock_l3.c
index b377b6c51ef2..d417c3c191c1 100644
--- a/tests/sys/net/routing/test_rtsock_l3.c
+++ b/tests/sys/net/routing/test_rtsock_l3.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Alexander V. Chernikov
*
diff --git a/tests/sys/net/routing/test_rtsock_lladdr.c b/tests/sys/net/routing/test_rtsock_lladdr.c
index c289832a9ea6..68c975d57a88 100644
--- a/tests/sys/net/routing/test_rtsock_lladdr.c
+++ b/tests/sys/net/routing/test_rtsock_lladdr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Alexander V. Chernikov
*
diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh
index 267e70ebf0dc..1de8d6a86f45 100755
--- a/tests/sys/netinet/carp.sh
+++ b/tests/sys/netinet/carp.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c
index 07fe90704206..482f767dd094 100644
--- a/tests/sys/netinet/socket_afinet.c
+++ b/tests/sys/netinet/socket_afinet.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Bjoern A. Zeeb
*
diff --git a/tests/sys/netmap/ctrl-api-test.c b/tests/sys/netmap/ctrl-api-test.c
index bf85fbb76a2b..8b2b0ac4399d 100644
--- a/tests/sys/netmap/ctrl-api-test.c
+++ b/tests/sys/netmap/ctrl-api-test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 Vincenzo Maffione
*
diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh
index 7ff9a1e18fdc..32466e6ae0b3 100644
--- a/tests/sys/netpfil/common/dummynet.sh
+++ b/tests/sys/netpfil/common/dummynet.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/common/forward.sh b/tests/sys/netpfil/common/forward.sh
index 9f73bb139598..1be01874d9b0 100644
--- a/tests/sys/netpfil/common/forward.sh
+++ b/tests/sys/netpfil/common/forward.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/common/fragments.sh b/tests/sys/netpfil/common/fragments.sh
index f20a24b7f197..e190d088f56d 100644
--- a/tests/sys/netpfil/common/fragments.sh
+++ b/tests/sys/netpfil/common/fragments.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/common/nat.sh b/tests/sys/netpfil/common/nat.sh
index 9aa06de51337..f64ac0446e7b 100644
--- a/tests/sys/netpfil/common/nat.sh
+++ b/tests/sys/netpfil/common/nat.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/common/pass_block.sh b/tests/sys/netpfil/common/pass_block.sh
index adba350fc0d3..2de6b35a8021 100644
--- a/tests/sys/netpfil/common/pass_block.sh
+++ b/tests/sys/netpfil/common/pass_block.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/common/pft_synflood.py b/tests/sys/netpfil/common/pft_synflood.py
index 3d37724593e2..67a5bba0def7 100644
--- a/tests/sys/netpfil/common/pft_synflood.py
+++ b/tests/sys/netpfil/common/pft_synflood.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/common/rdr.sh b/tests/sys/netpfil/common/rdr.sh
index 0c2169ce6b28..c66a3a012098 100644
--- a/tests/sys/netpfil/common/rdr.sh
+++ b/tests/sys/netpfil/common/rdr.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/common/runner.subr b/tests/sys/netpfil/common/runner.subr
index a2291f496fd5..c1961b2fddb8 100644
--- a/tests/sys/netpfil/common/runner.subr
+++ b/tests/sys/netpfil/common/runner.subr
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py
index cee6f73e22dc..ba05556f5324 100644
--- a/tests/sys/netpfil/common/sniffer.py
+++ b/tests/sys/netpfil/common/sniffer.py
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/common/tos.sh b/tests/sys/netpfil/common/tos.sh
index bd5e657ecf72..0b743eb8574d 100644
--- a/tests/sys/netpfil/common/tos.sh
+++ b/tests/sys/netpfil/common/tos.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/common/utils.subr b/tests/sys/netpfil/common/utils.subr
index 2a2ee0af8ebf..c9fc5a9fe3b5 100644
--- a/tests/sys/netpfil/common/utils.subr
+++ b/tests/sys/netpfil/common/utils.subr
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Ahsan Barkati
#
diff --git a/tests/sys/netpfil/pf/CVE-2019-5597.py b/tests/sys/netpfil/pf/CVE-2019-5597.py
index 1b25809cbedf..646791819e53 100644
--- a/tests/sys/netpfil/pf/CVE-2019-5597.py
+++ b/tests/sys/netpfil/pf/CVE-2019-5597.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Synacktiv
#
diff --git a/tests/sys/netpfil/pf/CVE-2019-5598.py b/tests/sys/netpfil/pf/CVE-2019-5598.py
index b72c04c5e19b..74a1270f369f 100644
--- a/tests/sys/netpfil/pf/CVE-2019-5598.py
+++ b/tests/sys/netpfil/pf/CVE-2019-5598.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh
index 27903d469507..b7d0deaa6e1b 100644
--- a/tests/sys/netpfil/pf/anchor.sh
+++ b/tests/sys/netpfil/pf/anchor.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/checksum.sh b/tests/sys/netpfil/pf/checksum.sh
index 9060e763d18d..ca5ab038f530 100644
--- a/tests/sys/netpfil/pf/checksum.sh
+++ b/tests/sys/netpfil/pf/checksum.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/dup.sh b/tests/sys/netpfil/pf/dup.sh
index 83ef57760eef..696d8e8f0e9b 100644
--- a/tests/sys/netpfil/pf/dup.sh
+++ b/tests/sys/netpfil/pf/dup.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/echo_inetd.conf b/tests/sys/netpfil/pf/echo_inetd.conf
index f5e287b64445..db3430ab1d3b 100644
--- a/tests/sys/netpfil/pf/echo_inetd.conf
+++ b/tests/sys/netpfil/pf/echo_inetd.conf
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh
index 0f00a366878b..ddbb4bcbc072 100644
--- a/tests/sys/netpfil/pf/forward.sh
+++ b/tests/sys/netpfil/pf/forward.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation.sh
index e62eb141eebd..e79800050165 100644
--- a/tests/sys/netpfil/pf/fragmentation.sh
+++ b/tests/sys/netpfil/pf/fragmentation.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/get_state.sh b/tests/sys/netpfil/pf/get_state.sh
index 5e6a9040e016..c138cbb8b7e1 100644
--- a/tests/sys/netpfil/pf/get_state.sh
+++ b/tests/sys/netpfil/pf/get_state.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/pf/icmp.sh b/tests/sys/netpfil/pf/icmp.sh
index 65a3d91297bd..404fcedcca30 100644
--- a/tests/sys/netpfil/pf/icmp.sh
+++ b/tests/sys/netpfil/pf/icmp.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh
index 7b32bacdf82c..1af760eb8bb5 100644
--- a/tests/sys/netpfil/pf/killstate.sh
+++ b/tests/sys/netpfil/pf/killstate.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/pf/map_e.sh b/tests/sys/netpfil/pf/map_e.sh
index 7a2b33069c59..ea8ce33bf323 100644
--- a/tests/sys/netpfil/pf/map_e.sh
+++ b/tests/sys/netpfil/pf/map_e.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 KUROSAWA Takahiro <takahiro.kurosawa@gmail.com>
#
diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh
index e3fb3eb56103..f1315158ddc1 100644
--- a/tests/sys/netpfil/pf/names.sh
+++ b/tests/sys/netpfil/pf/names.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
index a957dfd59c78..933045298f28 100644
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh
index 51c8c432038a..2a226f5c9651 100644
--- a/tests/sys/netpfil/pf/pass_block.sh
+++ b/tests/sys/netpfil/pf/pass_block.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
index c70d7690c37b..09ad0b45c7db 100644
--- a/tests/sys/netpfil/pf/pfsync.sh
+++ b/tests/sys/netpfil/pf/pfsync.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Orange Business Services
#
diff --git a/tests/sys/netpfil/pf/proxy.sh b/tests/sys/netpfil/pf/proxy.sh
index bb5286103e85..c51103a777de 100644
--- a/tests/sys/netpfil/pf/proxy.sh
+++ b/tests/sys/netpfil/pf/proxy.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/pf/ridentifier.sh b/tests/sys/netpfil/pf/ridentifier.sh
index da2f40c7ae98..5f9335a9454e 100644
--- a/tests/sys/netpfil/pf/ridentifier.sh
+++ b/tests/sys/netpfil/pf/ridentifier.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh
index 4edd9a56de3b..b45dbedf18c8 100644
--- a/tests/sys/netpfil/pf/route_to.sh
+++ b/tests/sys/netpfil/pf/route_to.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/rules_counter.sh b/tests/sys/netpfil/pf/rules_counter.sh
index 567bf439b0ef..78f61bdeb548 100644
--- a/tests/sys/netpfil/pf/rules_counter.sh
+++ b/tests/sys/netpfil/pf/rules_counter.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/pf/set_skip.sh b/tests/sys/netpfil/pf/set_skip.sh
index 9e9d5a5322f1..00c1c95c0091 100644
--- a/tests/sys/netpfil/pf/set_skip.sh
+++ b/tests/sys/netpfil/pf/set_skip.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/set_tos.sh b/tests/sys/netpfil/pf/set_tos.sh
index 1c05162318af..69ca31d024bf 100644
--- a/tests/sys/netpfil/pf/set_tos.sh
+++ b/tests/sys/netpfil/pf/set_tos.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/src_track.sh b/tests/sys/netpfil/pf/src_track.sh
index 15da39d8fe4a..d62df4ba0c9b 100755
--- a/tests/sys/netpfil/pf/src_track.sh
+++ b/tests/sys/netpfil/pf/src_track.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/syncookie.sh b/tests/sys/netpfil/pf/syncookie.sh
index dbb6407e9c38..81c5aa605e0b 100644
--- a/tests/sys/netpfil/pf/syncookie.sh
+++ b/tests/sys/netpfil/pf/syncookie.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Modirum MDPay
#
diff --git a/tests/sys/netpfil/pf/synproxy.sh b/tests/sys/netpfil/pf/synproxy.sh
index a111f40cfbcf..72fd6056a7fc 100644
--- a/tests/sys/netpfil/pf/synproxy.sh
+++ b/tests/sys/netpfil/pf/synproxy.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh
index a70c003e71ae..4a5784002264 100644
--- a/tests/sys/netpfil/pf/table.sh
+++ b/tests/sys/netpfil/pf/table.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 Mark Johnston <markj@FreeBSD.org>
#
diff --git a/tests/sys/netpfil/pf/tos.sh b/tests/sys/netpfil/pf/tos.sh
index 4e2832ba3317..7f488741b299 100644
--- a/tests/sys/netpfil/pf/tos.sh
+++ b/tests/sys/netpfil/pf/tos.sh
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
#
diff --git a/tests/sys/netpfil/pf/utils.subr b/tests/sys/netpfil/pf/utils.subr
index c9a404c8012e..fedb030a2666 100644
--- a/tests/sys/netpfil/pf/utils.subr
+++ b/tests/sys/netpfil/pf/utils.subr
@@ -1,7 +1,7 @@
# $FreeBSD$
# Utility functions
##
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
#
diff --git a/tests/sys/posixshm/memfd_test.c b/tests/sys/posixshm/memfd_test.c
index 3784c4f0c840..0bb95b301627 100644
--- a/tests/sys/posixshm/memfd_test.c
+++ b/tests/sys/posixshm/memfd_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
*
diff --git a/tests/sys/sys/bitset_test.c b/tests/sys/sys/bitset_test.c
index d193d2e3014c..bbf1bc131f35 100644
--- a/tests/sys/sys/bitset_test.c
+++ b/tests/sys/sys/bitset_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 The FreeBSD Foundation
*
diff --git a/tests/sys/vm/mlock_test.c b/tests/sys/vm/mlock_test.c
index fd2392a7d225..dfbb59a0dc91 100644
--- a/tests/sys/vm/mlock_test.c
+++ b/tests/sys/vm/mlock_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Mark Johnston <markj@FreeBSD.org>
*
diff --git a/tests/sys/vmm/utils.subr b/tests/sys/vmm/utils.subr
index 0de9c6c671ea..d515770a7a8f 100644
--- a/tests/sys/vmm/utils.subr
+++ b/tests/sys/vmm/utils.subr
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 The FreeBSD Foundation
#
diff --git a/tests/sys/vmm/vmm_cred_jail.sh b/tests/sys/vmm/vmm_cred_jail.sh
index 5dcb30e628c2..4ead7fdd897d 100644
--- a/tests/sys/vmm/vmm_cred_jail.sh
+++ b/tests/sys/vmm/vmm_cred_jail.sh
@@ -1,5 +1,5 @@
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 The FreeBSD Foundation
#
diff --git a/tools/build/make.py b/tools/build/make.py
index cede0c99e316..10041568283f 100755
--- a/tools/build/make.py
+++ b/tools/build/make.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# PYTHON_ARGCOMPLETE_OKAY
# -
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Alex Richardson <arichardson@FreeBSD.org>
#
diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua
index 9cc5fd727923..518fa46938a0 100644
--- a/tools/pkgbase/metalog_reader.lua
+++ b/tools/pkgbase/metalog_reader.lua
@@ -1,6 +1,6 @@
#!/usr/libexec/flua
--- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+-- SPDX-License-Identifier: BSD-2-Clause
--
-- Copyright(c) 2020 The FreeBSD Foundation.
--
diff --git a/tools/test/gpioevents/gpioevents.c b/tools/test/gpioevents/gpioevents.c
index 9beffa740875..90128dde4ca9 100644
--- a/tools/test/gpioevents/gpioevents.c
+++ b/tools/test/gpioevents/gpioevents.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Christian Kramer
* Copyright (c) 2020 Ian Lepore <ian@FreeBSD.org>
diff --git a/tools/test/popss/popss.c b/tools/test/popss/popss.c
index b41f2a32ae91..56c5f7896023 100644
--- a/tools/test/popss/popss.c
+++ b/tools/test/popss/popss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
* All rights reserved.
diff --git a/tools/test/vm86/vm86_test.c b/tools/test/vm86/vm86_test.c
index 8744213b8652..4c980b073c85 100644
--- a/tools/test/vm86/vm86_test.c
+++ b/tools/test/vm86/vm86_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
* All rights reserved.
diff --git a/tools/test/vm86/vm86_test_asm.s b/tools/test/vm86/vm86_test_asm.s
index bf032bdd232a..598166ee6eb7 100644
--- a/tools/test/vm86/vm86_test_asm.s
+++ b/tools/test/vm86/vm86_test_asm.s
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 The FreeBSD Foundation
* All rights reserved.
diff --git a/tools/tools/git/git-svn-init b/tools/tools/git/git-svn-init
index 3069514947f8..8af3735b1a0e 100755
--- a/tools/tools/git/git-svn-init
+++ b/tools/tools/git/git-svn-init
@@ -2,7 +2,7 @@
# $FreeBSD$
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright(c) 2018 Intel Corporation.
#
diff --git a/tools/tools/git/git-svn-rebase b/tools/tools/git/git-svn-rebase
index 7b31e327a4e5..90df94ad6038 100755
--- a/tools/tools/git/git-svn-rebase
+++ b/tools/tools/git/git-svn-rebase
@@ -2,7 +2,7 @@
# $FreeBSD$
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
#
diff --git a/tools/tools/intel-ucode-split/intel-ucode-split.c b/tools/tools/intel-ucode-split/intel-ucode-split.c
index 214b61af5328..9853f41bd767 100644
--- a/tools/tools/intel-ucode-split/intel-ucode-split.c
+++ b/tools/tools/intel-ucode-split/intel-ucode-split.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2018 The FreeBSD Foundation.
*
diff --git a/tools/tools/locale/tools/charmaps.pm b/tools/tools/locale/tools/charmaps.pm
index 827df3bc8820..5eeb2cfe80b3 100644
--- a/tools/tools/locale/tools/charmaps.pm
+++ b/tools/tools/locale/tools/charmaps.pm
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl -w
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2009 Edwin Groothuis <edwin@FreeBSD.org>
#
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index fd475db714a0..6fdc19122a25 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl -wC
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2009 Edwin Groothuis <edwin@FreeBSD.org>
# Copyright 2015 John Marino <draco@marino.st>
diff --git a/tools/tools/locale/tools/extract-colldef.awk b/tools/tools/locale/tools/extract-colldef.awk
index d02f1c49a6af..415b3144fa6d 100644
--- a/tools/tools/locale/tools/extract-colldef.awk
+++ b/tools/tools/locale/tools/extract-colldef.awk
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2016 Baptiste Daroussin <bapt@FreeBSD.org>
#
diff --git a/tools/tools/locale/tools/finalize b/tools/tools/locale/tools/finalize
index 88dfcad0cb24..f70a67df0f0d 100755
--- a/tools/tools/locale/tools/finalize
+++ b/tools/tools/locale/tools/finalize
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2015 John Marino <draco@marino.st>
#
diff --git a/tools/tools/locale/tools/mkwidths.pl b/tools/tools/locale/tools/mkwidths.pl
index 54cfdb59fe99..9959fcd7ff76 100755
--- a/tools/tools/locale/tools/mkwidths.pl
+++ b/tools/tools/locale/tools/mkwidths.pl
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl -w
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2009 Edwin Groothuis <edwin@FreeBSD.org>
# Copyright 2015 John Marino <draco@marino.st>
diff --git a/tools/tools/locale/tools/utf8-rollup.pl b/tools/tools/locale/tools/utf8-rollup.pl
index b275828d52c9..10dcefe69247 100755
--- a/tools/tools/locale/tools/utf8-rollup.pl
+++ b/tools/tools/locale/tools/utf8-rollup.pl
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl -wC
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2009 Edwin Groothuis <edwin@FreeBSD.org>
# Copyright 2015 John Marino <draco@marino.st>
diff --git a/tools/uma/smrstress/smrstress.c b/tools/uma/smrstress/smrstress.c
index 2cf5f50ffae4..eafa4a8a5d36 100644
--- a/tools/uma/smrstress/smrstress.c
+++ b/tools/uma/smrstress/smrstress.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Jeffrey Roberson <jeff@FreeBSD.org>
*
diff --git a/usr.bin/ar/acplex.l b/usr.bin/ar/acplex.l
index 8eb47e6a8d0e..427147ebfca6 100644
--- a/usr.bin/ar/acplex.l
+++ b/usr.bin/ar/acplex.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Kai Wang
* All rights reserved.
diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y
index 1ce7197ef222..ef5c5ec08569 100644
--- a/usr.bin/ar/acpyacc.y
+++ b/usr.bin/ar/acpyacc.y
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Kai Wang
* All rights reserved.
diff --git a/usr.bin/ar/ar.h b/usr.bin/ar/ar.h
index 66a7888c3e1c..67cdff973f37 100644
--- a/usr.bin/ar/ar.h
+++ b/usr.bin/ar/ar.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Kai Wang
* All rights reserved.
diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c
index 84b94a1f4d77..fc098e84b7bc 100644
--- a/usr.bin/ar/read.c
+++ b/usr.bin/ar/read.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Kai Wang
* Copyright (c) 2007 Tim Kientzle
diff --git a/usr.bin/ar/util.c b/usr.bin/ar/util.c
index b130d6195e47..c5ec93547fe4 100644
--- a/usr.bin/ar/util.c
+++ b/usr.bin/ar/util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c
index 2e5620d28732..4b5dd3df2f9a 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Kai Wang
* All rights reserved.
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 0543bbaf4e95..2096369859b1 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,7 +1,7 @@
/*-
* at.c : Put file into atrun queue
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993, 1994 Thomas Koenig
*
diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index 8bdc65d3532f..4b1c820dde73 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -1,7 +1,7 @@
/*-
* at.h - header for at(1)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993 Thomas Koenig
*
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 63cd68cf4223..00418625f5d9 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -1,7 +1,7 @@
/*-
* panic.c - terminate fast in case of error
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993 Thomas Koenig
*
diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h
index d5140482d6ff..8817bebe0d98 100644
--- a/usr.bin/at/panic.h
+++ b/usr.bin/at/panic.h
@@ -1,7 +1,7 @@
/*-
* panic.h - header for at(1)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993 Thomas Koenig
*
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 97f533c00c9a..99b67ccd3ec6 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -1,7 +1,7 @@
/*-
* parsetime.c - parse time for at(1)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993, 1994 Thomas Koenig
*
diff --git a/usr.bin/at/parsetime.h b/usr.bin/at/parsetime.h
index c3201645b081..7e3d54d752e6 100644
--- a/usr.bin/at/parsetime.h
+++ b/usr.bin/at/parsetime.h
@@ -1,7 +1,7 @@
/*-
* at.h - header for at(1)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993 Thomas Koenig
*
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index e2fb86ea5532..0ad343e98624 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -1,7 +1,7 @@
/*-
* perm.c - check user permission for at(1)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1994 Thomas Koenig
*
diff --git a/usr.bin/at/perm.h b/usr.bin/at/perm.h
index 59e10310a63b..50f911b370dc 100644
--- a/usr.bin/at/perm.h
+++ b/usr.bin/at/perm.h
@@ -1,7 +1,7 @@
/*-
* perm.h - header for at(1)
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1994 Thomas Koenig
*
diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h
index ba84ec9318d4..fac2a3b31c44 100644
--- a/usr.bin/at/privs.h
+++ b/usr.bin/at/privs.h
@@ -1,7 +1,7 @@
/*-
* privs.h - header for privileged operations
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993 Thomas Koenig
*
diff --git a/usr.bin/backlight/backlight.c b/usr.bin/backlight/backlight.c
index b90d46d49f64..c823e1d3a805 100644
--- a/usr.bin/backlight/backlight.c
+++ b/usr.bin/backlight/backlight.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/usr.bin/bluetooth/bthost/bthost.c b/usr.bin/bluetooth/bthost/bthost.c
index b5c5b72cf700..95d672317e6d 100644
--- a/usr.bin/bluetooth/bthost/bthost.c
+++ b/usr.bin/bluetooth/bthost/bthost.c
@@ -1,7 +1,7 @@
/*-
* bthost.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c
index 890fb4eea4d0..46ee0e101359 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.c
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* btsockstat.c
*
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
index 116c5c817799..778169486ed8 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
@@ -1,7 +1,7 @@
/*-
* rfcomm_sdp.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
index ff99591bdf1b..f28c145ce425 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 337e7085b3da..a1f51dbc9a64 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2005 Colin Percival
* All rights reserved
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index 6c9656486394..b7abdfb88d4a 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2003-2005 Colin Percival
* All rights reserved
diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c
index fbccf395b5f0..dd2d3b47d4bf 100644
--- a/usr.bin/c89/c89.c
+++ b/usr.bin/c89/c89.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* This is the Posix.2 mandated C compiler. Basically, a hook to the
* cc(1) command.
diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c
index 093023f2bda6..deabdf49f02c 100644
--- a/usr.bin/c99/c99.c
+++ b/usr.bin/c99/c99.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 740187c48463..88fd029c5919 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index 8ddea8a85f2a..5a7592ef46e8 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 53a5a894d480..ed6da20d827a 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* All rights reserved.
diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c
index a34ef5a9866d..656a3c391858 100644
--- a/usr.bin/calendar/parsedata.c
+++ b/usr.bin/calendar/parsedata.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index 46936e6d45cf..86fa203d9ff5 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/usr.bin/calendar/sunpos.c b/usr.bin/calendar/sunpos.c
index 48dd89391229..5b91f007faa9 100644
--- a/usr.bin/calendar/sunpos.c
+++ b/usr.bin/calendar/sunpos.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009-2010 Edwin Groothuis <edwin@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c
index e01a5911faf7..d19f2f49c51a 100644
--- a/usr.bin/cmp/link.c
+++ b/usr.bin/cmp/link.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Brian Somers <brian@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/cmp/tests/cmp_test2.sh b/usr.bin/cmp/tests/cmp_test2.sh
index c264827646ca..4dea55538089 100755
--- a/usr.bin/cmp/tests/cmp_test2.sh
+++ b/usr.bin/cmp/tests/cmp_test2.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Alan Somers
#
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 229a736245b8..666cca983337 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* FreeBSD Inc. All rights reserved.
diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c
index 79c6c2b6ca79..1dee12b06ec3 100644
--- a/usr.bin/cpuset/cpuset.c
+++ b/usr.bin/cpuset/cpuset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2008 Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c
index 99bcaab8f324..431293c20f39 100644
--- a/usr.bin/csplit/csplit.c
+++ b/usr.bin/csplit/csplit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index d607ab9f4523..f21ddf65c404 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004, 2008, 2009 Silicon Graphics International Corp.
* Copyright (c) 2017 Alexander Motin <mav@FreeBSD.org>
diff --git a/usr.bin/dc/tests/bcode.sh b/usr.bin/dc/tests/bcode.sh
index 4ca1d2675f9f..cc8e3fceafff 100755
--- a/usr.bin/dc/tests/bcode.sh
+++ b/usr.bin/dc/tests/bcode.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Alan Somers
#
diff --git a/usr.bin/dc/tests/inout.sh b/usr.bin/dc/tests/inout.sh
index de1e6819d67a..aab1c04761e6 100755
--- a/usr.bin/dc/tests/inout.sh
+++ b/usr.bin/dc/tests/inout.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Alan Somers
#
diff --git a/usr.bin/dtc/checking.cc b/usr.bin/dtc/checking.cc
index 33b071794e80..563d6a285fb7 100644
--- a/usr.bin/dtc/checking.cc
+++ b/usr.bin/dtc/checking.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/checking.hh b/usr.bin/dtc/checking.hh
index 5c5a6a0e13cc..9e9536ca7678 100644
--- a/usr.bin/dtc/checking.hh
+++ b/usr.bin/dtc/checking.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/dtb.cc b/usr.bin/dtc/dtb.cc
index 6346d63cc0af..27af8879cad4 100644
--- a/usr.bin/dtc/dtb.cc
+++ b/usr.bin/dtc/dtb.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/dtb.hh b/usr.bin/dtc/dtb.hh
index 4930246f9984..b8d48e5d32fd 100644
--- a/usr.bin/dtc/dtb.hh
+++ b/usr.bin/dtc/dtb.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/dtc.cc b/usr.bin/dtc/dtc.cc
index 14d3685ba9d4..3e626d13ed03 100644
--- a/usr.bin/dtc/dtc.cc
+++ b/usr.bin/dtc/dtc.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index 0080a7d445f2..d30afa8d438d 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/fdt.hh b/usr.bin/dtc/fdt.hh
index 6c737cc83e3e..9174edc539b7 100644
--- a/usr.bin/dtc/fdt.hh
+++ b/usr.bin/dtc/fdt.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/input_buffer.cc b/usr.bin/dtc/input_buffer.cc
index 052178949cb2..e2bfde8d8796 100644
--- a/usr.bin/dtc/input_buffer.cc
+++ b/usr.bin/dtc/input_buffer.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/input_buffer.hh b/usr.bin/dtc/input_buffer.hh
index 2a6d741f7b61..0663afcd951a 100644
--- a/usr.bin/dtc/input_buffer.hh
+++ b/usr.bin/dtc/input_buffer.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/string.cc b/usr.bin/dtc/string.cc
index c5acb82687ea..bd10d6dc01fc 100644
--- a/usr.bin/dtc/string.cc
+++ b/usr.bin/dtc/string.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
index 2f0727e87eb5..9906c66e7b98 100644
--- a/usr.bin/dtc/util.hh
+++ b/usr.bin/dtc/util.hh
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 David Chisnall
* All rights reserved.
diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c
index e98b1b45dcf1..41b45aee80b8 100644
--- a/usr.bin/elfctl/elfctl.c
+++ b/usr.bin/elfctl/elfctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 The FreeBSD Foundation.
*
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index 28b42a55a508..b7f60d0eb27b 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 David O'Brien. All rights reserved.
* Copyright (c) 2001 Jake Burkholder
diff --git a/usr.bin/env/envopts.c b/usr.bin/env/envopts.c
index 5c15b36baa30..3834385f3139 100644
--- a/usr.bin/env/envopts.c
+++ b/usr.bin/env/envopts.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/env/envopts.h b/usr.bin/env/envopts.h
index 5c6dcf64607a..553efef7acd2 100644
--- a/usr.bin/env/envopts.h
+++ b/usr.bin/env/envopts.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 - Garance Alistair Drosehn <gad@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/finger/pathnames.h b/usr.bin/finger/pathnames.h
index a60ce7d1a956..32ebfa1252af 100644
--- a/usr.bin/finger/pathnames.h
+++ b/usr.bin/finger/pathnames.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Mark Knight <markk@knigma.org>
* All rights reserved.
diff --git a/usr.bin/fstat/functions.h b/usr.bin/fstat/functions.h
index ba46aa4ce36f..ac5a11160477 100644
--- a/usr.bin/fstat/functions.h
+++ b/usr.bin/fstat/functions.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/fstat/fuser.c b/usr.bin/fstat/fuser.c
index 2d9aa72875f4..87e5284c53eb 100644
--- a/usr.bin/fstat/fuser.c
+++ b/usr.bin/fstat/fuser.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2009 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/fstat/main.c b/usr.bin/fstat/main.c
index ab08386dab45..6d2c0ff43d0c 100644
--- a/usr.bin/fstat/main.c
+++ b/usr.bin/fstat/main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c
index f6a4286fa4c2..1ec963587810 100644
--- a/usr.bin/fsync/fsync.c
+++ b/usr.bin/fsync/fsync.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Paul Saab <ps@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index b01adb9a73b4..b1d1d4898e13 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2007 Sandvine Incorporated
diff --git a/usr.bin/getent/getent.c b/usr.bin/getent/getent.c
index 1b1427e18385..440d59a7a41d 100644
--- a/usr.bin/getent/getent.c
+++ b/usr.bin/getent/getent.c
@@ -1,7 +1,7 @@
/* $NetBSD: getent.c,v 1.7 2005/08/24 14:31:02 ginsbach Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c
index 787e8fbe03bb..1710b5aacdb3 100644
--- a/usr.bin/grep/file.c
+++ b/usr.bin/grep/file.c
@@ -3,7 +3,7 @@
/* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index f8c38e70e6b3..f9e8b9e5a2a5 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -3,7 +3,7 @@
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index 62e82c7f56b6..3ac05f75fa8b 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -3,7 +3,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008-2009 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index 9babdbf74af8..bcaa959f406c 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -2,7 +2,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* All rights reserved.
diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh
index f6881791357c..c66d5a55fe21 100755
--- a/usr.bin/grep/tests/grep_freebsd_test.sh
+++ b/usr.bin/grep/tests/grep_freebsd_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 698e347c192e..eba060ba6cdc 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -3,7 +3,7 @@
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/gzip/tests/zdiff_test.sh b/usr.bin/gzip/tests/zdiff_test.sh
index ef1bcb278998..e260261fa291 100644
--- a/usr.bin/gzip/tests/zdiff_test.sh
+++ b/usr.bin/gzip/tests/zdiff_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2022 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/usr.bin/gzip/unpack.c b/usr.bin/gzip/unpack.c
index 2ebfaf108be4..db43fae4a776 100644
--- a/usr.bin/gzip/unpack.c
+++ b/usr.bin/gzip/unpack.c
@@ -2,7 +2,7 @@
/* $NetBSD: unpack.c,v 1.3 2017/08/04 07:27:08 mrg Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Xin LI <delphij@FreeBSD.org>
*
diff --git a/usr.bin/hexdump/tests/hexdump_test.sh b/usr.bin/hexdump/tests/hexdump_test.sh
index f51112214717..5e19d1f99225 100755
--- a/usr.bin/hexdump/tests/hexdump_test.sh
+++ b/usr.bin/hexdump/tests/hexdump_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/usr.bin/hexdump/tests/od_test.sh b/usr.bin/hexdump/tests/od_test.sh
index 211685bd1add..b171a0a884f2 100755
--- a/usr.bin/hexdump/tests/od_test.sh
+++ b/usr.bin/hexdump/tests/od_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2018 (C) Yuri Pankov
# All rights reserved.
diff --git a/usr.bin/indent/indent.h b/usr.bin/indent/indent.h
index 2de26b1aac2e..a15acb7e6fbf 100644
--- a/usr.bin/indent/indent.h
+++ b/usr.bin/indent/indent.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Jens Schweikhardt
* All rights reserved.
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index e4c861b6c6a9..d7f78cd1cd7c 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.bin/iscsictl/iscsictl.h b/usr.bin/iscsictl/iscsictl.h
index 4360a6eee26d..1c01ab47df40 100644
--- a/usr.bin/iscsictl/iscsictl.h
+++ b/usr.bin/iscsictl/iscsictl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.bin/iscsictl/parse.y b/usr.bin/iscsictl/parse.y
index 333a512b5905..da052e2c0403 100644
--- a/usr.bin/iscsictl/parse.y
+++ b/usr.bin/iscsictl/parse.y
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.bin/iscsictl/token.l b/usr.bin/iscsictl/token.l
index 0d517e5a89ad..3c119ffe03a7 100644
--- a/usr.bin/iscsictl/token.l
+++ b/usr.bin/iscsictl/token.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.bin/kdump/linux.c b/usr.bin/kdump/linux.c
index df400f554c23..48c82b2a8017 100644
--- a/usr.bin/kdump/linux.c
+++ b/usr.bin/kdump/linux.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Dmitry Chagin <dchagin@FreeBSD.org>
*
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index 494a527d190b..6966460236b2 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
* Copyright (c) 2000 Paul Saab <ps@FreeBSD.org>
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index bbe8fb19aae9..fee3d1b8caaf 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Jake Burkholder
* Copyright (c) 2004 Robert Watson
diff --git a/usr.bin/lastcomm/readrec.c b/usr.bin/lastcomm/readrec.c
index 5e3ed92947f5..03991e0282c7 100644
--- a/usr.bin/lastcomm/readrec.c
+++ b/usr.bin/lastcomm/readrec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Diomidis Spinellis
* All rights reserved.
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index 052caa64cff9..55df9ba92cd4 100644
--- a/usr.bin/locale/locale.c
+++ b/usr.bin/locale/locale.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/locale/tests/locale_test.sh b/usr.bin/locale/tests/locale_test.sh
index aa6f870c3750..7513ea446c3e 100755
--- a/usr.bin/locale/tests/locale_test.sh
+++ b/usr.bin/locale/tests/locale_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2019 Yuri Pankov
#
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index ead474362c8a..fe1fcd63d9d5 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 284ea6416493..5e04d84a1c3d 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index c01dcf9fcf7d..3f99ba6fc288 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index f8b6376a6147..b330f3e6700d 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1997 John D. Polstra. All rights reserved.
*
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 3a27d46d5520..990ae8fd6696 100644
--- a/usr.bin/login/login.h
+++ b/usr.bin/login/login.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 FreeBSD, Inc
*
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index 60b329810734..b0326cdcb8ca 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2010 Gordon Tetlow
# All rights reserved.
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index b61db66070dc..7ec92e2df49e 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994, 1995, 1996, 1998 Peter Wemm <peter@netplex.com.au>
* All rights reserved.
diff --git a/usr.bin/mktemp/tests/mktemp_test.sh b/usr.bin/mktemp/tests/mktemp_test.sh
index 505c60536b34..e37e6128aba0 100755
--- a/usr.bin/mktemp/tests/mktemp_test.sh
+++ b/usr.bin/mktemp/tests/mktemp_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2022 Klara Systems
#
diff --git a/usr.bin/mkuzip/mkuz_zstd.c b/usr.bin/mkuzip/mkuz_zstd.c
index d59cb47917d2..d7f3a704688d 100644
--- a/usr.bin/mkuzip/mkuz_zstd.c
+++ b/usr.bin/mkuzip/mkuz_zstd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/usr.bin/mkuzip/mkuz_zstd.h b/usr.bin/mkuzip/mkuz_zstd.h
index 874e2d82812c..89ce32557295 100644
--- a/usr.bin/mkuzip/mkuz_zstd.h
+++ b/usr.bin/mkuzip/mkuz_zstd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Conrad Meyer <cem@FreeBSD.org>
*
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index a2763e06440c..cfc5d54f53a4 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 35266c225bce..bc902fc0f282 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
index 425174608851..ca0359466353 100644
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Christian S.J. Peron
* All rights reserved.
diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c
index 9c9f05f406c5..bcb9351353c5 100644
--- a/usr.bin/netstat/netisr.c
+++ b/usr.bin/netstat/netisr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
diff --git a/usr.bin/netstat/nhgrp.c b/usr.bin/netstat/nhgrp.c
index 557580e6cd2e..45175f30e56b 100644
--- a/usr.bin/netstat/nhgrp.c
+++ b/usr.bin/netstat/nhgrp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Alexander V. Chernikov
*
diff --git a/usr.bin/newgrp/newgrp.c b/usr.bin/newgrp/newgrp.c
index f8f54f7d6e37..bec6806661df 100644
--- a/usr.bin/newgrp/newgrp.c
+++ b/usr.bin/newgrp/newgrp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/patch/tests/unified_patch_test.sh b/usr.bin/patch/tests/unified_patch_test.sh
index afd4b457f8d2..9312b3632ab2 100755
--- a/usr.bin/patch/tests/unified_patch_test.sh
+++ b/usr.bin/patch/tests/unified_patch_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Kyle Evans <kevans@FreeBSD.org>
#
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index 314454f331b9..651243388735 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/perror/perror.c b/usr.bin/perror/perror.c
index 1cf502aa1f3d..bbf53e5e77c4 100644
--- a/usr.bin/perror/perror.c
+++ b/usr.bin/perror/perror.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: George V. Neville-Neil <gnn@FreeBSD.org>
diff --git a/usr.bin/pr/tests/basic2_test.sh b/usr.bin/pr/tests/basic2_test.sh
index b35bde8c259e..1184d27d77be 100644
--- a/usr.bin/pr/tests/basic2_test.sh
+++ b/usr.bin/pr/tests/basic2_test.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2017 Alan Somers
#
diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c
index 2388c035b431..a0d5b91072ca 100644
--- a/usr.bin/procstat/procstat.c
+++ b/usr.bin/procstat/procstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007, 2011 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat.h b/usr.bin/procstat/procstat.h
index d3bd12d42ffd..0082845d0588 100644
--- a/usr.bin/procstat/procstat.h
+++ b/usr.bin/procstat/procstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_advlock.c b/usr.bin/procstat/procstat_advlock.c
index e0b256a8023a..2940503817d6 100644
--- a/usr.bin/procstat/procstat_advlock.c
+++ b/usr.bin/procstat/procstat_advlock.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 The FreeBSD Foundation
*
diff --git a/usr.bin/procstat/procstat_args.c b/usr.bin/procstat/procstat_args.c
index 7f364ae0603f..a43915e0d901 100644
--- a/usr.bin/procstat/procstat_args.c
+++ b/usr.bin/procstat/procstat_args.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c
index d58faf9777c4..0bc51f125a45 100644
--- a/usr.bin/procstat/procstat_auxv.c
+++ b/usr.bin/procstat/procstat_auxv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Mikolaj Golub
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_basic.c b/usr.bin/procstat/procstat_basic.c
index b509ea248e45..cc08c8674e65 100644
--- a/usr.bin/procstat/procstat_basic.c
+++ b/usr.bin/procstat/procstat_basic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_bin.c b/usr.bin/procstat/procstat_bin.c
index e08f39711679..223d16f66909 100644
--- a/usr.bin/procstat/procstat_bin.c
+++ b/usr.bin/procstat/procstat_bin.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_cred.c b/usr.bin/procstat/procstat_cred.c
index 3b3554e6bb25..a98d622e4f66 100644
--- a/usr.bin/procstat/procstat_cred.c
+++ b/usr.bin/procstat/procstat_cred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2008 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index 1d7b419b3f4a..1c5336f4b12b 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2011 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index 586cbab388ed..aa27a65be019 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_penv.c b/usr.bin/procstat/procstat_penv.c
index d7e51d2fb04c..d374aa7e0a74 100644
--- a/usr.bin/procstat/procstat_penv.c
+++ b/usr.bin/procstat/procstat_penv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Juraj Lutter <juraj@lutter.sk>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_pwdx.c b/usr.bin/procstat/procstat_pwdx.c
index 22550ec8233c..fc8500314255 100644
--- a/usr.bin/procstat/procstat_pwdx.c
+++ b/usr.bin/procstat/procstat_pwdx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Juraj Lutter <juraj@lutter.sk>
* All rights reserved.
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 769a5b61356c..17e91a2b3a4d 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Mikolaj Golub
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_sigs.c b/usr.bin/procstat/procstat_sigs.c
index 7a63b7f9c76f..21104abf7096 100644
--- a/usr.bin/procstat/procstat_sigs.c
+++ b/usr.bin/procstat/procstat_sigs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Konstantin Belousov
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index 237abca61386..b20085366ee1 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 7d698fefdc30..cf1cc58380c3 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Robert N. M. Watson
* Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
diff --git a/usr.bin/protect/protect.c b/usr.bin/protect/protect.c
index d9990be01d03..1bf807d7919c 100644
--- a/usr.bin/protect/protect.c
+++ b/usr.bin/protect/protect.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.bin/rctl/rctl.c b/usr.bin/rctl/rctl.c
index 2bb4bb9aff1b..10038aeaae32 100644
--- a/usr.bin/rctl/rctl.c
+++ b/usr.bin/rctl/rctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/usr.bin/revoke/revoke.c b/usr.bin/revoke/revoke.c
index ca976ac1a035..3996ca8df8ce 100644
--- a/usr.bin/revoke/revoke.c
+++ b/usr.bin/revoke/revoke.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/sdiotool/cam_sdio.h b/usr.bin/sdiotool/cam_sdio.h
index 32d8d079de0e..95e60ad2875a 100644
--- a/usr.bin/sdiotool/cam_sdio.h
+++ b/usr.bin/sdiotool/cam_sdio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Ilya Bakulin
* All rights reserved.
diff --git a/usr.bin/sdiotool/linux_compat.h b/usr.bin/sdiotool/linux_compat.h
index f9d8dd55132c..e68d1799a745 100644
--- a/usr.bin/sdiotool/linux_compat.h
+++ b/usr.bin/sdiotool/linux_compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016-2017 Ilya Bakulin
* All rights reserved.
diff --git a/usr.bin/sdiotool/linux_sdio_compat.h b/usr.bin/sdiotool/linux_sdio_compat.h
index 9236a23eff94..fa884a623f80 100644
--- a/usr.bin/sdiotool/linux_sdio_compat.h
+++ b/usr.bin/sdiotool/linux_sdio_compat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Ilya Bakulin
* All rights reserved.
diff --git a/usr.bin/setchannel/setchannel.c b/usr.bin/setchannel/setchannel.c
index a229290c864a..6f50890360c9 100644
--- a/usr.bin/setchannel/setchannel.c
+++ b/usr.bin/setchannel/setchannel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004, 2005
* John Wehle <john@feith.com>. All rights reserved.
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c
index 440204afaee7..cfcf98be0edc 100644
--- a/usr.bin/sockstat/sockstat.c
+++ b/usr.bin/sockstat/sockstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
* All rights reserved.
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index 073a1280e2c1..d84c5558ba6f 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h
index 0e837c40b266..efc0c8b4fe28 100644
--- a/usr.bin/sort/bwstring.h
+++ b/usr.bin/sort/bwstring.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index e3d388743d4a..410137e36153 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h
index e89c9f823310..6a7b9dd50007 100644
--- a/usr.bin/sort/coll.h
+++ b/usr.bin/sort/coll.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index dfd13f61ea25..4fd3c153816c 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index 724928a7c050..fc3b7261fe79 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index 18794666da51..8f0a44569fe6 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h
index 6a4edcd59161..a6c1af1be5bb 100644
--- a/usr.bin/sort/mem.h
+++ b/usr.bin/sort/mem.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index 578493f4d47c..7add9c498f5f 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h
index 6d5b9281e7aa..e3b694167635 100644
--- a/usr.bin/sort/radixsort.h
+++ b/usr.bin/sort/radixsort.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index b7c8107cc22d..e66e649ce114 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index 47ce6ea29ab3..c1a17df1044c 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 804b57530733..6cc22e4adbde 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index 8ab1612e65cb..b2f78538fdf2 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
* Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh
index 58f62c3d018f..cabc4c01495e 100755
--- a/usr.bin/split/tests/split_test.sh
+++ b/usr.bin/split/tests/split_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2022 Klara Systems
#
diff --git a/usr.bin/ssh-copy-id/ssh-copy-id.sh b/usr.bin/ssh-copy-id/ssh-copy-id.sh
index 11066dc41001..341be87d38c2 100755
--- a/usr.bin/ssh-copy-id/ssh-copy-id.sh
+++ b/usr.bin/ssh-copy-id/ssh-copy-id.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2012 Eitan Adler
#
diff --git a/usr.bin/stdbuf/stdbuf.c b/usr.bin/stdbuf/stdbuf.c
index d9355e472266..ecbcd50a64fb 100644
--- a/usr.bin/stdbuf/stdbuf.c
+++ b/usr.bin/stdbuf/stdbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
* All rights reserved.
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index 79a44a6c3f5e..745616039c80 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 David E. O'Brien
* 2015, 2021 Yoshihiro Ota
diff --git a/usr.bin/systat/proc.c b/usr.bin/systat/proc.c
index 58c3bea64239..9f9650c9415b 100644
--- a/usr.bin/systat/proc.c
+++ b/usr.bin/systat/proc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Yoshihiro Ota <ota@j.email.ne.jp>
*
diff --git a/usr.bin/systat/sysput.c b/usr.bin/systat/sysput.c
index 6e14f9eb752f..02e32de1fabc 100644
--- a/usr.bin/systat/sysput.c
+++ b/usr.bin/systat/sysput.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019, 2020 Yoshihiro Ota
*
diff --git a/usr.bin/systat/zarc.c b/usr.bin/systat/zarc.c
index 41efe136779d..8eb3849a9172 100644
--- a/usr.bin/systat/zarc.c
+++ b/usr.bin/systat/zarc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 - 2017, 2019 Yoshihiro Ota
*
diff --git a/usr.bin/tabs/tabs.c b/usr.bin/tabs/tabs.c
index c9809206ec02..e01d7fcc6e0e 100644
--- a/usr.bin/tabs/tabs.c
+++ b/usr.bin/tabs/tabs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/tail/tests/tail_test.sh b/usr.bin/tail/tests/tail_test.sh
index 66d435f2cd02..49e14297221b 100755
--- a/usr.bin/tail/tests/tail_test.sh
+++ b/usr.bin/tail/tests/tail_test.sh
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2016 Alan Somers
#
diff --git a/usr.bin/tr/cmap.c b/usr.bin/tr/cmap.c
index 1df2c99d7b74..cd67aa91a799 100644
--- a/usr.bin/tr/cmap.c
+++ b/usr.bin/tr/cmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/tr/cmap.h b/usr.bin/tr/cmap.h
index d7df72ea4671..f1eb3d5b3c32 100644
--- a/usr.bin/tr/cmap.h
+++ b/usr.bin/tr/cmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/tr/cset.c b/usr.bin/tr/cset.c
index 3b2a08dac414..f6e110999a5d 100644
--- a/usr.bin/tr/cset.c
+++ b/usr.bin/tr/cset.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/tr/cset.h b/usr.bin/tr/cset.h
index 5d41107558a4..bdc500a2cfda 100644
--- a/usr.bin/tr/cset.h
+++ b/usr.bin/tr/cset.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c
index 0f6c14b15c16..015370df8b8f 100644
--- a/usr.bin/truncate/truncate.c
+++ b/usr.bin/truncate/truncate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Sheldon Hearn <sheldonh@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index a3ce8f27d953..edff76d7e3ad 100644
--- a/usr.bin/truss/truss.h
+++ b/usr.bin/truss/truss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2001 Jamey Wood
*
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 50331d5ad9b2..d8616016f53d 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 - 2015 Tony Finch <dot@dotat.at>
*
diff --git a/usr.bin/unifdef/unifdefall.sh b/usr.bin/unifdef/unifdefall.sh
index e9c394efbd62..e7056c2d0c6c 100644
--- a/usr.bin/unifdef/unifdefall.sh
+++ b/usr.bin/unifdef/unifdefall.sh
@@ -2,7 +2,7 @@
#
# unifdefall: remove all the #if's from a source file
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2002 - 2013 Tony Finch <dot@dotat.at>
# Copyright (c) 2009 - 2010 Jonathan Nieder <jrnieder@gmail.com>
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 02aeb60606f2..b222ade449df 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* units.c Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
*
diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c
index 78731555eadc..578eaca9d772 100644
--- a/usr.bin/unzip/unzip.c
+++ b/usr.bin/unzip/unzip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
* Copyright (c) 2007-2008 Dag-Erling Smørgrav
diff --git a/usr.bin/whereis/pathnames.h b/usr.bin/whereis/pathnames.h
index 2bcf28cee32c..085b0a8a63d6 100644
--- a/usr.bin/whereis/pathnames.h
+++ b/usr.bin/whereis/pathnames.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright © 2002, Jörg Wunsch
*
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index abf94b7860e2..046800c42df2 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright © 2002, Jörg Wunsch
*
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 6ad4f18c3b78..ff4696553c7b 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Tim J. Robbins.
* All rights reserved.
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index bfd9e37465c4..1372b175f116 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994 Christopher G. Demetriou
* Copyright (c) 1994 Simon J. Gerraty
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 8a31657fb980..72a3017b5ea0 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c
index 96ef446ab2dc..0e931ebf0626 100644
--- a/usr.sbin/acpi/acpidb/acpidb.c
+++ b/usr.sbin/acpi/acpidb/acpidb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000-2002 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 6f758e60a176..a70d83ccbd41 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index afdba12ca7b8..f176b4ff6cd8 100644
--- a/usr.sbin/acpi/acpidump/acpi_user.c
+++ b/usr.sbin/acpi/acpidump/acpi_user.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c
index bc541e117807..868fe8dd216b 100644
--- a/usr.sbin/acpi/acpidump/acpidump.c
+++ b/usr.sbin/acpi/acpidump/acpidump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h
index f717101aec63..13c3175e55c5 100644
--- a/usr.sbin/acpi/acpidump/acpidump.h
+++ b/usr.sbin/acpi/acpidump/acpidump.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Doug Rabson
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index 91a1b4b4cf01..fb4b51fc23e3 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2002-2004 Michael Telahun Makonnen. All rights reserved.
#
diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh
index abaf004e7f66..50dff7241211 100644
--- a/usr.sbin/adduser/rmuser.sh
+++ b/usr.sbin/adduser/rmuser.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2002, 2003 Michael Telahun Makonnen. All rights reserved.
#
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 1d2a964927b9..54003a33ad3e 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* APM (Advanced Power Management) Event Dispatcher
*
diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h
index e56005e3c0f9..51493ab577e5 100644
--- a/usr.sbin/apmd/apmd.h
+++ b/usr.sbin/apmd/apmd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* APM (Advanced Power Management) Event Dispatcher
*
diff --git a/usr.sbin/apmd/apmdlex.l b/usr.sbin/apmd/apmdlex.l
index 67cb52d5c309..91c7480418d2 100644
--- a/usr.sbin/apmd/apmdlex.l
+++ b/usr.sbin/apmd/apmdlex.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* APM (Advanced Power Management) Event Dispatcher
*
diff --git a/usr.sbin/apmd/apmdparse.y b/usr.sbin/apmd/apmdparse.y
index 6f135934388d..4fb2ededbe08 100644
--- a/usr.sbin/apmd/apmdparse.y
+++ b/usr.sbin/apmd/apmdparse.y
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* APM (Advanced Power Management) Event Dispatcher
*
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index cd29c910bce2..540b64b3a374 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index b1ca746d405a..905a46343684 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 33b3a366cb8d..53b85fdf6a34 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 4581e5c4f2f9..96d7b910caf9 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/common.h b/usr.sbin/autofs/common.h
index e68a0be5f7c8..4d0a97853a28 100644
--- a/usr.sbin/autofs/common.h
+++ b/usr.sbin/autofs/common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c
index 205378d2b15d..9b84dc8c373d 100644
--- a/usr.sbin/autofs/defined.c
+++ b/usr.sbin/autofs/defined.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
index fb20e43b302d..8d9319d45290 100644
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/autofs/token.l b/usr.sbin/autofs/token.l
index b277d7759f94..436295e9f867 100644
--- a/usr.sbin/autofs/token.l
+++ b/usr.sbin/autofs/token.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 457575e395d8..870134c9a631 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/acpi.h b/usr.sbin/bhyve/acpi.h
index 98479913732c..982313e65a6a 100644
--- a/usr.sbin/bhyve/acpi.h
+++ b/usr.sbin/bhyve/acpi.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c
index e37fc50b8c91..3def2cf31d8f 100644
--- a/usr.sbin/bhyve/acpi_device.c
+++ b/usr.sbin/bhyve/acpi_device.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
* Author: Corvin Köhne <c.koehne@beckhoff.com>
diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h
index 32e299f2da86..8d0ab89f9215 100644
--- a/usr.sbin/bhyve/acpi_device.h
+++ b/usr.sbin/bhyve/acpi_device.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
* Author: Corvin Köhne <c.koehne@beckhoff.com>
diff --git a/usr.sbin/bhyve/ahci.h b/usr.sbin/bhyve/ahci.h
index 691d4bd438f4..3de587f20b36 100644
--- a/usr.sbin/bhyve/ahci.h
+++ b/usr.sbin/bhyve/ahci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/atkbdc.c
index 5acde3874be3..96a952a84e00 100644
--- a/usr.sbin/bhyve/atkbdc.c
+++ b/usr.sbin/bhyve/atkbdc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2015 Nahanni Systems Inc.
diff --git a/usr.sbin/bhyve/audio.c b/usr.sbin/bhyve/audio.c
index 165face5862c..deb2913bd782 100644
--- a/usr.sbin/bhyve/audio.c
+++ b/usr.sbin/bhyve/audio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Alex Teaca <iateaca@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/audio.h b/usr.sbin/bhyve/audio.h
index 143030b29ae7..e7802cf3026f 100644
--- a/usr.sbin/bhyve/audio.h
+++ b/usr.sbin/bhyve/audio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Alex Teaca <iateaca@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/bhyvegc.c b/usr.sbin/bhyve/bhyvegc.c
index 4bd49ded7970..82981bb92071 100644
--- a/usr.sbin/bhyve/bhyvegc.c
+++ b/usr.sbin/bhyve/bhyvegc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/bhyvegc.h b/usr.sbin/bhyve/bhyvegc.h
index 11323586dfaf..3518c0b9dd1c 100644
--- a/usr.sbin/bhyve/bhyvegc.h
+++ b/usr.sbin/bhyve/bhyvegc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index fbc1fd99ea59..14a4eb9cabec 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/bhyverun.h b/usr.sbin/bhyve/bhyverun.h
index d3eb8c8b23da..23282a17b228 100644
--- a/usr.sbin/bhyve/bhyverun.h
+++ b/usr.sbin/bhyve/bhyverun.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index edf191491de1..187a5ac55e09 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/block_if.h b/usr.sbin/bhyve/block_if.h
index cf3acc05c98f..b36d0c367890 100644
--- a/usr.sbin/bhyve/block_if.h
+++ b/usr.sbin/bhyve/block_if.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/bootrom.c b/usr.sbin/bhyve/bootrom.c
index b851d39b485c..b6530873bf50 100644
--- a/usr.sbin/bhyve/bootrom.c
+++ b/usr.sbin/bhyve/bootrom.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/bootrom.h b/usr.sbin/bhyve/bootrom.h
index f718d5728c84..9c80f3137907 100644
--- a/usr.sbin/bhyve/bootrom.h
+++ b/usr.sbin/bhyve/bootrom.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/config.c b/usr.sbin/bhyve/config.c
index 807890516eea..ba51f81dd011 100644
--- a/usr.sbin/bhyve/config.c
+++ b/usr.sbin/bhyve/config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 John H. Baldwin <jhb@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/config.h b/usr.sbin/bhyve/config.h
index a7e4b6d03a5c..eb78a8129d12 100644
--- a/usr.sbin/bhyve/config.h
+++ b/usr.sbin/bhyve/config.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 John H. Baldwin <jhb@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/console.c b/usr.sbin/bhyve/console.c
index d845df754048..fe1d691b7676 100644
--- a/usr.sbin/bhyve/console.c
+++ b/usr.sbin/bhyve/console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/console.h b/usr.sbin/bhyve/console.h
index 8029c28ab8a9..037acf9d8838 100644
--- a/usr.sbin/bhyve/console.h
+++ b/usr.sbin/bhyve/console.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/debug.h b/usr.sbin/bhyve/debug.h
index f63e0a9ef129..da32c784b669 100644
--- a/usr.sbin/bhyve/debug.h
+++ b/usr.sbin/bhyve/debug.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vincenzo Maffione <vmaffione@freebsd.org>
*
diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c
index 047a1050e7fd..5227c06f0da7 100644
--- a/usr.sbin/bhyve/fwctl.c
+++ b/usr.sbin/bhyve/fwctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/fwctl.h b/usr.sbin/bhyve/fwctl.h
index 6dad2448119b..c009aa9262cf 100644
--- a/usr.sbin/bhyve/fwctl.h
+++ b/usr.sbin/bhyve/fwctl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c
index 6368d5cc79a9..6c1315a8371d 100644
--- a/usr.sbin/bhyve/gdb.c
+++ b/usr.sbin/bhyve/gdb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017-2018 John H. Baldwin <jhb@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/gdb.h b/usr.sbin/bhyve/gdb.h
index c5fa522c63e0..dff4cd962785 100644
--- a/usr.sbin/bhyve/gdb.h
+++ b/usr.sbin/bhyve/gdb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 John H. Baldwin <jhb@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c
index cfab2e7f2547..b23171bf94fb 100644
--- a/usr.sbin/bhyve/hda_codec.c
+++ b/usr.sbin/bhyve/hda_codec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Alex Teaca <iateaca@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/hda_reg.h b/usr.sbin/bhyve/hda_reg.h
index c309056c6f5d..e1422e7e9751 100644
--- a/usr.sbin/bhyve/hda_reg.h
+++ b/usr.sbin/bhyve/hda_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
diff --git a/usr.sbin/bhyve/hdac_reg.h b/usr.sbin/bhyve/hdac_reg.h
index 35272e5135cb..3a2ccae2dd33 100644
--- a/usr.sbin/bhyve/hdac_reg.h
+++ b/usr.sbin/bhyve/hdac_reg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Stephane E. Potvin <sepotvin@videotron.ca>
* All rights reserved.
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
index 6e58f544b452..f05f9e31fd38 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/inout.h b/usr.sbin/bhyve/inout.h
index a3a37e03ff68..86ee72b34a19 100644
--- a/usr.sbin/bhyve/inout.h
+++ b/usr.sbin/bhyve/inout.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
index acdbb5111b2e..2907b521f1e5 100644
--- a/usr.sbin/bhyve/ioapic.c
+++ b/usr.sbin/bhyve/ioapic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/bhyve/ioapic.h b/usr.sbin/bhyve/ioapic.h
index 3a7fa7619268..273303dbd374 100644
--- a/usr.sbin/bhyve/ioapic.h
+++ b/usr.sbin/bhyve/ioapic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c
index a70abf079413..bc24f370e6a2 100644
--- a/usr.sbin/bhyve/iov.c
+++ b/usr.sbin/bhyve/iov.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Jakub Klama <jceel@FreeBSD.org>.
* Copyright (c) 2018 Alexander Motin <mav@FreeBSD.org>
diff --git a/usr.sbin/bhyve/iov.h b/usr.sbin/bhyve/iov.h
index f46b04b71eb5..5eb66916992e 100644
--- a/usr.sbin/bhyve/iov.h
+++ b/usr.sbin/bhyve/iov.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Jakub Klama <jceel@FreeBSD.org>.
* Copyright (c) 2018 Alexander Motin <mav@FreeBSD.org>
diff --git a/usr.sbin/bhyve/ipc.h b/usr.sbin/bhyve/ipc.h
index 674fc210e0fb..5da416f6539b 100644
--- a/usr.sbin/bhyve/ipc.h
+++ b/usr.sbin/bhyve/ipc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2022 Rob Wing <rew@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/kernemu_dev.c b/usr.sbin/bhyve/kernemu_dev.c
index 503c40462715..64341cceccfd 100644
--- a/usr.sbin/bhyve/kernemu_dev.c
+++ b/usr.sbin/bhyve/kernemu_dev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/usr.sbin/bhyve/kernemu_dev.h b/usr.sbin/bhyve/kernemu_dev.h
index 7927855da0cd..14f2645d880a 100644
--- a/usr.sbin/bhyve/kernemu_dev.h
+++ b/usr.sbin/bhyve/kernemu_dev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index 10cc7bbaa7fc..73ab2a744b89 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/mem.h b/usr.sbin/bhyve/mem.h
index 965079107476..55691e358cb0 100644
--- a/usr.sbin/bhyve/mem.h
+++ b/usr.sbin/bhyve/mem.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/mevent.c b/usr.sbin/bhyve/mevent.c
index 8a6267f4acbd..62ff261f4a2c 100644
--- a/usr.sbin/bhyve/mevent.c
+++ b/usr.sbin/bhyve/mevent.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/mevent.h b/usr.sbin/bhyve/mevent.h
index 8c3db9db54a0..f637413f3f38 100644
--- a/usr.sbin/bhyve/mevent.h
+++ b/usr.sbin/bhyve/mevent.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/mevent_test.c b/usr.sbin/bhyve/mevent_test.c
index eda1c100e8a3..85e1b2b1400c 100644
--- a/usr.sbin/bhyve/mevent_test.c
+++ b/usr.sbin/bhyve/mevent_test.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/mptbl.c b/usr.sbin/bhyve/mptbl.c
index 6e3f78a22888..c6d9cb8fbe1c 100644
--- a/usr.sbin/bhyve/mptbl.c
+++ b/usr.sbin/bhyve/mptbl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/mptbl.h b/usr.sbin/bhyve/mptbl.h
index ebc8d85ea8e0..2f4faf353a74 100644
--- a/usr.sbin/bhyve/mptbl.h
+++ b/usr.sbin/bhyve/mptbl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c
index 5dd5f8a17d66..bc4a1792164d 100644
--- a/usr.sbin/bhyve/net_backends.c
+++ b/usr.sbin/bhyve/net_backends.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vincenzo Maffione <vmaffione@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/net_backends.h b/usr.sbin/bhyve/net_backends.h
index bc7834546bc1..844024e7bc9d 100644
--- a/usr.sbin/bhyve/net_backends.h
+++ b/usr.sbin/bhyve/net_backends.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vincenzo Maffione <vmaffione@FreeBSD.org>
*
diff --git a/usr.sbin/bhyve/net_utils.c b/usr.sbin/bhyve/net_utils.c
index 8088fa89a50f..1cee3f90ae8c 100644
--- a/usr.sbin/bhyve/net_utils.c
+++ b/usr.sbin/bhyve/net_utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
*
diff --git a/usr.sbin/bhyve/net_utils.h b/usr.sbin/bhyve/net_utils.h
index 3dd44572588c..4cc132f66f16 100644
--- a/usr.sbin/bhyve/net_utils.h
+++ b/usr.sbin/bhyve/net_utils.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vincenzo Maffione <v.maffione@gmail.com>
*
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 9c023d93cab9..a263eae6ad49 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Zhixiang Yu <zcore@freebsd.org>
* Copyright (c) 2015-2016 Alexander Motin <mav@FreeBSD.org>
diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c
index bec8edb17caf..7c670f5acb66 100644
--- a/usr.sbin/bhyve/pci_e82545.c
+++ b/usr.sbin/bhyve/pci_e82545.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2015 Peter Grehan <grehan@freebsd.org>
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 2b73d82be025..47ddf3f1809c 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h
index 40487b18f87b..ce14f5e34889 100644
--- a/usr.sbin/bhyve/pci_emul.h
+++ b/usr.sbin/bhyve/pci_emul.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
index 91215a124c59..bcdfe89d9727 100644
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Nahanni Systems, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c
index 9e9d7ab5a626..24ad1ec08f52 100644
--- a/usr.sbin/bhyve/pci_hda.c
+++ b/usr.sbin/bhyve/pci_hda.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Alex Teaca <iateaca@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_hda.h b/usr.sbin/bhyve/pci_hda.h
index a021aa9c28da..d44f365f6f60 100644
--- a/usr.sbin/bhyve/pci_hda.h
+++ b/usr.sbin/bhyve/pci_hda.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Alex Teaca <iateaca@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c
index cbc61893961b..03eacc5e134a 100644
--- a/usr.sbin/bhyve/pci_hostbridge.c
+++ b/usr.sbin/bhyve/pci_hostbridge.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_irq.c b/usr.sbin/bhyve/pci_irq.c
index 2ce962cdec44..dbc4e1df1bcb 100644
--- a/usr.sbin/bhyve/pci_irq.c
+++ b/usr.sbin/bhyve/pci_irq.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/bhyve/pci_irq.h b/usr.sbin/bhyve/pci_irq.h
index 1ae56efc8f2a..6591edb43aa6 100644
--- a/usr.sbin/bhyve/pci_irq.h
+++ b/usr.sbin/bhyve/pci_irq.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
index 8213f32985ef..5ed523316c10 100644
--- a/usr.sbin/bhyve/pci_lpc.c
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
diff --git a/usr.sbin/bhyve/pci_lpc.h b/usr.sbin/bhyve/pci_lpc.h
index ff3ea98b4f9c..a79809cd838a 100644
--- a/usr.sbin/bhyve/pci_lpc.h
+++ b/usr.sbin/bhyve/pci_lpc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index cf1c815096d3..9f99a39de441 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Shunsuke Mie
* Copyright (c) 2018 Leon Dang
diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c
index b214021998d2..2475a574249c 100644
--- a/usr.sbin/bhyve/pci_passthru.c
+++ b/usr.sbin/bhyve/pci_passthru.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h
index e999e84f85f2..d18839e116fa 100644
--- a/usr.sbin/bhyve/pci_passthru.h
+++ b/usr.sbin/bhyve/pci_passthru.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Beckhoff Automation GmbH & Co. KG
* Author: Corvin Köhne <c.koehne@beckhoff.com>
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index f610c6236dfc..7115c96eb2ae 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index 7c412891f295..9fd6db41dba8 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c
index 0f57c7a8248f..51e4ca84b2be 100644
--- a/usr.sbin/bhyve/pci_virtio_console.c
+++ b/usr.sbin/bhyve/pci_virtio_console.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 iXsystems Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_virtio_input.c b/usr.sbin/bhyve/pci_virtio_input.c
index 00ec86a70db0..7c15eaeec29b 100644
--- a/usr.sbin/bhyve/pci_virtio_input.c
+++ b/usr.sbin/bhyve/pci_virtio_input.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index 92ea78826391..9af5854037fe 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c
index ff7e6b7fc7c8..a3d31b311148 100644
--- a/usr.sbin/bhyve/pci_virtio_rnd.c
+++ b/usr.sbin/bhyve/pci_virtio_rnd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Nahanni Systems Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c
index 7da825ad4050..f5728c5c53c2 100644
--- a/usr.sbin/bhyve/pci_virtio_scsi.c
+++ b/usr.sbin/bhyve/pci_virtio_scsi.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Jakub Klama <jceel@FreeBSD.org>.
* Copyright (c) 2018 Marcelo Araujo <araujo@FreeBSD.org>.
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
index 0ac1423f0736..ad1d2f60ec3e 100644
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Leon Dang <ldang@nahannisys.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pci_xhci.h b/usr.sbin/bhyve/pci_xhci.h
index 9112b5b30c74..5702eaae90b4 100644
--- a/usr.sbin/bhyve/pci_xhci.h
+++ b/usr.sbin/bhyve/pci_xhci.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Leon Dang <ldang@nahannisys.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c
index 8b810e641bbc..07c1d34f54eb 100644
--- a/usr.sbin/bhyve/pctestdev.c
+++ b/usr.sbin/bhyve/pctestdev.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Adam Fenn <adam@fenn.io>
*
diff --git a/usr.sbin/bhyve/pctestdev.h b/usr.sbin/bhyve/pctestdev.h
index 5808abe6e356..1b9ab9b610b0 100644
--- a/usr.sbin/bhyve/pctestdev.h
+++ b/usr.sbin/bhyve/pctestdev.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2020 Adam Fenn <adam@fenn.io>
*
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
index b941536b0e5b..54fc9fa70594 100644
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/post.c
index 69cf5cf39db7..4fa0fa438e18 100644
--- a/usr.sbin/bhyve/post.c
+++ b/usr.sbin/bhyve/post.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/ps2kbd.c b/usr.sbin/bhyve/ps2kbd.c
index 3bbd88ef2552..ac6a6e6b5ec3 100644
--- a/usr.sbin/bhyve/ps2kbd.c
+++ b/usr.sbin/bhyve/ps2kbd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2015 Nahanni Systems Inc.
diff --git a/usr.sbin/bhyve/ps2kbd.h b/usr.sbin/bhyve/ps2kbd.h
index 3cf87be1b7f3..d0fdf377c520 100644
--- a/usr.sbin/bhyve/ps2kbd.h
+++ b/usr.sbin/bhyve/ps2kbd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/ps2mouse.c b/usr.sbin/bhyve/ps2mouse.c
index 2ec26f5c4cae..211e7f221363 100644
--- a/usr.sbin/bhyve/ps2mouse.c
+++ b/usr.sbin/bhyve/ps2mouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2015 Nahanni Systems Inc.
diff --git a/usr.sbin/bhyve/ps2mouse.h b/usr.sbin/bhyve/ps2mouse.h
index 01f2bfa9ca0f..c1885c244855 100644
--- a/usr.sbin/bhyve/ps2mouse.h
+++ b/usr.sbin/bhyve/ps2mouse.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c
index af819dc4a952..e88608d90cae 100644
--- a/usr.sbin/bhyve/qemu_fwcfg.c
+++ b/usr.sbin/bhyve/qemu_fwcfg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
* Author: Corvin Köhne <c.koehne@beckhoff.com>
diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h
index d318d0434285..def0487fdf02 100644
--- a/usr.sbin/bhyve/qemu_fwcfg.h
+++ b/usr.sbin/bhyve/qemu_fwcfg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Beckhoff Automation GmbH & Co. KG
* Author: Corvin Köhne <c.koehne@beckhoff.com>
diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c
index 2640a67902e1..eb7333911867 100644
--- a/usr.sbin/bhyve/rfb.c
+++ b/usr.sbin/bhyve/rfb.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2015 Leon Dang
diff --git a/usr.sbin/bhyve/rfb.h b/usr.sbin/bhyve/rfb.h
index 5a5785af41b0..d0d3188a7328 100644
--- a/usr.sbin/bhyve/rfb.h
+++ b/usr.sbin/bhyve/rfb.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/rtc.c
index 3c0429e547af..8ef3837a71be 100644
--- a/usr.sbin/bhyve/rtc.c
+++ b/usr.sbin/bhyve/rtc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/rtc.h b/usr.sbin/bhyve/rtc.h
index c8b3572e93c6..eb72c3054df6 100644
--- a/usr.sbin/bhyve/rtc.h
+++ b/usr.sbin/bhyve/rtc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Peter Grehan <grehan@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index cafb0343519f..eddac4dae1fc 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/smbiostbl.h b/usr.sbin/bhyve/smbiostbl.h
index 027f600e09a9..a6caacfa0f15 100644
--- a/usr.sbin/bhyve/smbiostbl.h
+++ b/usr.sbin/bhyve/smbiostbl.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
index 3f805192bb99..5f9ef2053990 100644
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Flavius Anton
* Copyright (c) 2016 Mihai Tiganus
diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h
index e59c92f2326f..9bf881fded92 100644
--- a/usr.sbin/bhyve/snapshot.h
+++ b/usr.sbin/bhyve/snapshot.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2016 Flavius Anton
* Copyright (c) 2016 Mihai Tiganus
diff --git a/usr.sbin/bhyve/sockstream.c b/usr.sbin/bhyve/sockstream.c
index b592bce9aa5a..b755de597e7d 100644
--- a/usr.sbin/bhyve/sockstream.c
+++ b/usr.sbin/bhyve/sockstream.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Nahanni Systems, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/sockstream.h b/usr.sbin/bhyve/sockstream.h
index ecea849471a3..3da049373451 100644
--- a/usr.sbin/bhyve/sockstream.h
+++ b/usr.sbin/bhyve/sockstream.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Nahanni Systems, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index 0498ee91232d..e912e8f1d675 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/spinup_ap.h b/usr.sbin/bhyve/spinup_ap.h
index ee201427c585..6c13da425aaa 100644
--- a/usr.sbin/bhyve/spinup_ap.h
+++ b/usr.sbin/bhyve/spinup_ap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/task_switch.c b/usr.sbin/bhyve/task_switch.c
index 1aac3c4bfea4..23060963a33f 100644
--- a/usr.sbin/bhyve/task_switch.c
+++ b/usr.sbin/bhyve/task_switch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index 1539c7ffa135..1bf4e03b9583 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 NetApp, Inc.
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
diff --git a/usr.sbin/bhyve/uart_emul.h b/usr.sbin/bhyve/uart_emul.h
index a66701c18580..23d707fee1e4 100644
--- a/usr.sbin/bhyve/uart_emul.h
+++ b/usr.sbin/bhyve/uart_emul.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bhyve/usb_emul.c b/usr.sbin/bhyve/usb_emul.c
index d97d7b38d2f8..fb3ef7031ee8 100644
--- a/usr.sbin/bhyve/usb_emul.c
+++ b/usr.sbin/bhyve/usb_emul.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Nahanni Systems Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/usb_emul.h b/usr.sbin/bhyve/usb_emul.h
index 9a2844a8db1e..681d0806ca53 100644
--- a/usr.sbin/bhyve/usb_emul.h
+++ b/usr.sbin/bhyve/usb_emul.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Leon Dang <ldang@nahannisys.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c
index e76f6984c4fd..79a3a1c296d3 100644
--- a/usr.sbin/bhyve/usb_mouse.c
+++ b/usr.sbin/bhyve/usb_mouse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Leon Dang <ldang@nahannisys.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/vga.c b/usr.sbin/bhyve/vga.c
index f139dc38937b..50b6e37544d9 100644
--- a/usr.sbin/bhyve/vga.c
+++ b/usr.sbin/bhyve/vga.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/vga.h b/usr.sbin/bhyve/vga.h
index f4c631a9305b..660662f43dc1 100644
--- a/usr.sbin/bhyve/vga.h
+++ b/usr.sbin/bhyve/vga.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* All rights reserved.
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index 68304f76dc49..16e3e532c3a2 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Chris Torek <torek @ torek net>
* All rights reserved.
diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h
index 7fc3e7c3fc84..69c7ac0df133 100644
--- a/usr.sbin/bhyve/virtio.h
+++ b/usr.sbin/bhyve/virtio.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Chris Torek <torek @ torek net>
* All rights reserved.
diff --git a/usr.sbin/bhyve/vmgenc.c b/usr.sbin/bhyve/vmgenc.c
index 7d0b2faf246a..05618c5cba8b 100644
--- a/usr.sbin/bhyve/vmgenc.c
+++ b/usr.sbin/bhyve/vmgenc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/usr.sbin/bhyve/vmgenc.h b/usr.sbin/bhyve/vmgenc.h
index 437824c1025d..8de2364e3c10 100644
--- a/usr.sbin/bhyve/vmgenc.h
+++ b/usr.sbin/bhyve/vmgenc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2020 Conrad Meyer <cem@FreeBSD.org>. All rights reserved.
*
diff --git a/usr.sbin/bhyve/xmsr.c b/usr.sbin/bhyve/xmsr.c
index 5f735152e92c..35c90f12fcc9 100644
--- a/usr.sbin/bhyve/xmsr.c
+++ b/usr.sbin/bhyve/xmsr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyve/xmsr.h b/usr.sbin/bhyve/xmsr.h
index 1fb47c3ae2f0..4285a116806d 100644
--- a/usr.sbin/bhyve/xmsr.h
+++ b/usr.sbin/bhyve/xmsr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index e5789eaf30e8..2a022c550d54 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index 09a9653ece34..eb8a1bb64974 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
*
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.c b/usr.sbin/bluetooth/bcmfw/bcmfw.c
index f385eae0d9ea..328790b1b837 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.c
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.c
@@ -1,7 +1,7 @@
/*-
* bcmfw.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
index c7b3a0634eb0..deb890c573b0 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
@@ -1,7 +1,7 @@
/*-
* bthidcontrol.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
index a35e07021335..26706698994a 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
@@ -1,7 +1,7 @@
/*-
* bthidcontrol.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidcontrol/hid.c b/usr.sbin/bluetooth/bthidcontrol/hid.c
index 793d17430084..05c06e20bbf0 100644
--- a/usr.sbin/bluetooth/bthidcontrol/hid.c
+++ b/usr.sbin/bluetooth/bthidcontrol/hid.c
@@ -1,7 +1,7 @@
/*-
* hid.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidcontrol/sdp.c b/usr.sbin/bluetooth/bthidcontrol/sdp.c
index c63ddd5efa0a..e302a8a90448 100644
--- a/usr.sbin/bluetooth/bthidcontrol/sdp.c
+++ b/usr.sbin/bluetooth/bthidcontrol/sdp.c
@@ -1,7 +1,7 @@
/*-
* sdp.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/bthid_config.h b/usr.sbin/bluetooth/bthidd/bthid_config.h
index 8a53329333be..bccadd3be59a 100644
--- a/usr.sbin/bluetooth/bthidd/bthid_config.h
+++ b/usr.sbin/bluetooth/bthidd/bthid_config.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.c b/usr.sbin/bluetooth/bthidd/bthidd.c
index 1910a91732fd..83471936365b 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.c
+++ b/usr.sbin/bluetooth/bthidd/bthidd.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.h b/usr.sbin/bluetooth/bthidd/bthidd.h
index 9ceeb050f2ed..842b59a9c04f 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.h
+++ b/usr.sbin/bluetooth/bthidd/bthidd.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/btuinput.c b/usr.sbin/bluetooth/bthidd/btuinput.c
index c51ce8dd0ffc..2b947fa68214 100644
--- a/usr.sbin/bluetooth/bthidd/btuinput.c
+++ b/usr.sbin/bluetooth/bthidd/btuinput.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2017 Vladimir Kondratyev <wulf@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/btuinput.h b/usr.sbin/bluetooth/bthidd/btuinput.h
index c17814b36146..a8dc1a652a77 100644
--- a/usr.sbin/bluetooth/bthidd/btuinput.h
+++ b/usr.sbin/bluetooth/bthidd/btuinput.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015-2017 Vladimir Kondratyev <wulf@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/client.c b/usr.sbin/bluetooth/bthidd/client.c
index 2d8a1162d468..6fa7baf915b0 100644
--- a/usr.sbin/bluetooth/bthidd/client.c
+++ b/usr.sbin/bluetooth/bthidd/client.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/hid.c b/usr.sbin/bluetooth/bthidd/hid.c
index e5695578b27d..17c2d92f8316 100644
--- a/usr.sbin/bluetooth/bthidd/hid.c
+++ b/usr.sbin/bluetooth/bthidd/hid.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index 814c130a7ccd..a3b6ec95c190 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/kbd.h b/usr.sbin/bluetooth/bthidd/kbd.h
index a13e0b09886c..80988139f1a4 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.h
+++ b/usr.sbin/bluetooth/bthidd/kbd.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/lexer.l b/usr.sbin/bluetooth/bthidd/lexer.l
index 22b5d2d18651..d8b1921fc9ae 100644
--- a/usr.sbin/bluetooth/bthidd/lexer.l
+++ b/usr.sbin/bluetooth/bthidd/lexer.l
@@ -4,7 +4,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/parser.y b/usr.sbin/bluetooth/bthidd/parser.y
index bbb6202909fe..40c62686eeeb 100644
--- a/usr.sbin/bluetooth/bthidd/parser.y
+++ b/usr.sbin/bluetooth/bthidd/parser.y
@@ -4,7 +4,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/server.c b/usr.sbin/bluetooth/bthidd/server.c
index 59b4bafc6a06..dc9cf891faa5 100644
--- a/usr.sbin/bluetooth/bthidd/server.c
+++ b/usr.sbin/bluetooth/bthidd/server.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/bthidd/session.c b/usr.sbin/bluetooth/bthidd/session.c
index aa3552c4dc10..0cac823c9406 100644
--- a/usr.sbin/bluetooth/bthidd/session.c
+++ b/usr.sbin/bluetooth/bthidd/session.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/btpand/client.c b/usr.sbin/bluetooth/btpand/client.c
index bf61dfc9e798..e4aa0aec9430 100644
--- a/usr.sbin/bluetooth/btpand/client.c
+++ b/usr.sbin/bluetooth/btpand/client.c
@@ -1,7 +1,7 @@
/* $NetBSD: client.c,v 1.2 2008/12/06 20:01:14 plunky Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Iain Hibbert
* All rights reserved.
diff --git a/usr.sbin/bluetooth/btpand/event.c b/usr.sbin/bluetooth/btpand/event.c
index 502b73eaee46..f87084add858 100644
--- a/usr.sbin/bluetooth/btpand/event.c
+++ b/usr.sbin/bluetooth/btpand/event.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/btpand/event.h b/usr.sbin/bluetooth/btpand/event.h
index e70b7ce3e02a..e7a0341ceec8 100644
--- a/usr.sbin/bluetooth/btpand/event.h
+++ b/usr.sbin/bluetooth/btpand/event.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/adv_data.c b/usr.sbin/bluetooth/hccontrol/adv_data.c
index 8f11d99a397f..35ca7f2ab664 100644
--- a/usr.sbin/bluetooth/hccontrol/adv_data.c
+++ b/usr.sbin/bluetooth/hccontrol/adv_data.c
@@ -1,7 +1,7 @@
/*-
* adv_data.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
* Copyright (c) 2020 Marc Veldman <marc@bumblingdork.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.c b/usr.sbin/bluetooth/hccontrol/hccontrol.c
index 4fc78054fd7b..b74d7b6fa84f 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.c
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.c
@@ -1,7 +1,7 @@
/*-
* hccontrol.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.h b/usr.sbin/bluetooth/hccontrol/hccontrol.h
index 912bf26a04a5..2cb7e8017da8 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.h
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.h
@@ -1,7 +1,7 @@
/*-
* hccontrol.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
index 6f912c2238ba..d89a481e8e20 100644
--- a/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
+++ b/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
@@ -1,7 +1,7 @@
/*-
* host_controller_baseband.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/info.c b/usr.sbin/bluetooth/hccontrol/info.c
index aa9ce17bc75b..b8d6e3b234f9 100644
--- a/usr.sbin/bluetooth/hccontrol/info.c
+++ b/usr.sbin/bluetooth/hccontrol/info.c
@@ -1,7 +1,7 @@
/*-
* info.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c
index edf47814a968..db84a58a4371 100644
--- a/usr.sbin/bluetooth/hccontrol/link_control.c
+++ b/usr.sbin/bluetooth/hccontrol/link_control.c
@@ -1,7 +1,7 @@
/*-
* link_control.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/link_policy.c b/usr.sbin/bluetooth/hccontrol/link_policy.c
index 52e02e3c2bf4..5ce296ef81a8 100644
--- a/usr.sbin/bluetooth/hccontrol/link_policy.c
+++ b/usr.sbin/bluetooth/hccontrol/link_policy.c
@@ -1,7 +1,7 @@
/*-
* link_policy.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/node.c b/usr.sbin/bluetooth/hccontrol/node.c
index 2b41171bbd16..8d8ee2059596 100644
--- a/usr.sbin/bluetooth/hccontrol/node.c
+++ b/usr.sbin/bluetooth/hccontrol/node.c
@@ -1,7 +1,7 @@
/*-
* node.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/send_recv.c b/usr.sbin/bluetooth/hccontrol/send_recv.c
index dd9a7aa5b570..05ed1537ec31 100644
--- a/usr.sbin/bluetooth/hccontrol/send_recv.c
+++ b/usr.sbin/bluetooth/hccontrol/send_recv.c
@@ -1,7 +1,7 @@
/*-
* send_recv.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/status.c b/usr.sbin/bluetooth/hccontrol/status.c
index fe5dfb7360f0..4e6ea48b58e3 100644
--- a/usr.sbin/bluetooth/hccontrol/status.c
+++ b/usr.sbin/bluetooth/hccontrol/status.c
@@ -1,7 +1,7 @@
/*-
* status.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hccontrol/util.c b/usr.sbin/bluetooth/hccontrol/util.c
index 10d781936564..decb95a1b655 100644
--- a/usr.sbin/bluetooth/hccontrol/util.c
+++ b/usr.sbin/bluetooth/hccontrol/util.c
@@ -1,7 +1,7 @@
/*-
* util.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.c b/usr.sbin/bluetooth/hcsecd/hcsecd.c
index 160b77e1b040..43db3e6f6a39 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.c
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.c
@@ -1,7 +1,7 @@
/*-
* hcsecd.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.h b/usr.sbin/bluetooth/hcsecd/hcsecd.h
index 1500c008477f..a1cbcac792fe 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.h
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.h
@@ -1,7 +1,7 @@
/*-
* hcsecd.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hcsecd/lexer.l b/usr.sbin/bluetooth/hcsecd/lexer.l
index d2fecc4fb6ec..801bbc8ea18b 100644
--- a/usr.sbin/bluetooth/hcsecd/lexer.l
+++ b/usr.sbin/bluetooth/hcsecd/lexer.l
@@ -2,7 +2,7 @@
/*-
* lexer.l
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hcsecd/parser.y b/usr.sbin/bluetooth/hcsecd/parser.y
index 3ff9bac6e0f9..86138a71ac57 100644
--- a/usr.sbin/bluetooth/hcsecd/parser.y
+++ b/usr.sbin/bluetooth/hcsecd/parser.y
@@ -2,7 +2,7 @@
/*-
* parser.y
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.c b/usr.sbin/bluetooth/hcseriald/hcseriald.c
index 3d2fc60cf4de..cf83721b147e 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.c
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.c
@@ -1,7 +1,7 @@
/*-
* hcseriald.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbt_dbg.h b/usr.sbin/bluetooth/iwmbtfw/iwmbt_dbg.h
index 2a93b306ce5d..af784b395aaa 100644
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbt_dbg.h
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbt_dbg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@freebsd.org>
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c b/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c
index 963d5d5d9008..5fe270c7f059 100644
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@freebsd.org>
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.h b/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.h
index 8291fed427f2..bb22c4b58161 100644
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.h
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbt_fw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@freebsd.org>
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c b/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c
index 218fd28b74a2..faa002e774db 100644
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.h b/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.h
index 5bc1d15181cd..8a4748629568 100644
--- a/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.h
+++ b/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
*
diff --git a/usr.sbin/bluetooth/iwmbtfw/main.c b/usr.sbin/bluetooth/iwmbtfw/main.c
index eb1d97a9bb00..807d4db61afa 100644
--- a/usr.sbin/bluetooth/iwmbtfw/main.c
+++ b/usr.sbin/bluetooth/iwmbtfw/main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Adrian Chadd <adrian@freebsd.org>
* Copyright (c) 2019 Vladimir Kondratyev <wulf@FreeBSD.org>
diff --git a/usr.sbin/bluetooth/l2control/l2cap.c b/usr.sbin/bluetooth/l2control/l2cap.c
index cc92c77ec5dc..f459c492749d 100644
--- a/usr.sbin/bluetooth/l2control/l2cap.c
+++ b/usr.sbin/bluetooth/l2control/l2cap.c
@@ -1,7 +1,7 @@
/*-
* l2cap.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/l2control/l2control.c b/usr.sbin/bluetooth/l2control/l2control.c
index a8dceb16a6d3..b184d9e72293 100644
--- a/usr.sbin/bluetooth/l2control/l2control.c
+++ b/usr.sbin/bluetooth/l2control/l2control.c
@@ -1,7 +1,7 @@
/*-
* l2control.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/l2control/l2control.h b/usr.sbin/bluetooth/l2control/l2control.h
index 00eeef505328..af86f7a953e7 100644
--- a/usr.sbin/bluetooth/l2control/l2control.h
+++ b/usr.sbin/bluetooth/l2control/l2control.h
@@ -1,7 +1,7 @@
/*-
* l2control.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.c b/usr.sbin/bluetooth/l2ping/l2ping.c
index 49e900588d99..93c606bcae58 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.c
+++ b/usr.sbin/bluetooth/l2ping/l2ping.c
@@ -1,7 +1,7 @@
/*-
* l2ping.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
index b1077727b503..5623dd1d494e 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
index 8a3c4d33cc41..2c36d7536e1b 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
@@ -1,7 +1,7 @@
/*-
* sdpcontrol.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
index ec0c829a89ea..afbb210753c3 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
@@ -1,7 +1,7 @@
/*-
* sdpcontrol.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpcontrol/search.c b/usr.sbin/bluetooth/sdpcontrol/search.c
index 1d143e0bc818..ccb9ed365ea3 100644
--- a/usr.sbin/bluetooth/sdpcontrol/search.c
+++ b/usr.sbin/bluetooth/sdpcontrol/search.c
@@ -1,7 +1,7 @@
/*-
* search.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/audio_sink.c b/usr.sbin/bluetooth/sdpd/audio_sink.c
index 0ffdfa88146b..466dbd3c262b 100644
--- a/usr.sbin/bluetooth/sdpd/audio_sink.c
+++ b/usr.sbin/bluetooth/sdpd/audio_sink.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Hans Petter Selasky <hselasky@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/audio_source.c b/usr.sbin/bluetooth/sdpd/audio_source.c
index 1d58a323f8cb..dc61b46e9f8f 100644
--- a/usr.sbin/bluetooth/sdpd/audio_source.c
+++ b/usr.sbin/bluetooth/sdpd/audio_source.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Hans Petter Selasky <hselasky@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/bgd.c b/usr.sbin/bluetooth/sdpd/bgd.c
index 75306ce49c6d..0345d7b9b625 100644
--- a/usr.sbin/bluetooth/sdpd/bgd.c
+++ b/usr.sbin/bluetooth/sdpd/bgd.c
@@ -1,7 +1,7 @@
/*-
* bgd.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/dun.c b/usr.sbin/bluetooth/sdpd/dun.c
index 8c21604a05aa..50ec3685f667 100644
--- a/usr.sbin/bluetooth/sdpd/dun.c
+++ b/usr.sbin/bluetooth/sdpd/dun.c
@@ -1,7 +1,7 @@
/*-
* dun.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/ftrn.c b/usr.sbin/bluetooth/sdpd/ftrn.c
index 23cfab4eceb5..a3a0e2cde665 100644
--- a/usr.sbin/bluetooth/sdpd/ftrn.c
+++ b/usr.sbin/bluetooth/sdpd/ftrn.c
@@ -1,7 +1,7 @@
/*-
* ftrn.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/gn.c b/usr.sbin/bluetooth/sdpd/gn.c
index 894701b81481..cecb93a38a67 100644
--- a/usr.sbin/bluetooth/sdpd/gn.c
+++ b/usr.sbin/bluetooth/sdpd/gn.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/irmc.c b/usr.sbin/bluetooth/sdpd/irmc.c
index ee91335dbe38..9de370c70aea 100644
--- a/usr.sbin/bluetooth/sdpd/irmc.c
+++ b/usr.sbin/bluetooth/sdpd/irmc.c
@@ -1,7 +1,7 @@
/*-
* irmc.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/irmc_command.c b/usr.sbin/bluetooth/sdpd/irmc_command.c
index 3b7e38bdf7f9..0280016856b2 100644
--- a/usr.sbin/bluetooth/sdpd/irmc_command.c
+++ b/usr.sbin/bluetooth/sdpd/irmc_command.c
@@ -1,7 +1,7 @@
/*-
* irmc_command_command_command.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/lan.c b/usr.sbin/bluetooth/sdpd/lan.c
index 86ef71f64f2e..0fc22df94d6f 100644
--- a/usr.sbin/bluetooth/sdpd/lan.c
+++ b/usr.sbin/bluetooth/sdpd/lan.c
@@ -1,7 +1,7 @@
/*-
* lan.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/log.c b/usr.sbin/bluetooth/sdpd/log.c
index 98d3526e9121..57394c89b159 100644
--- a/usr.sbin/bluetooth/sdpd/log.c
+++ b/usr.sbin/bluetooth/sdpd/log.c
@@ -1,7 +1,7 @@
/*-
* log.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/log.h b/usr.sbin/bluetooth/sdpd/log.h
index b2c780e5e83e..fcc53a02c64c 100644
--- a/usr.sbin/bluetooth/sdpd/log.h
+++ b/usr.sbin/bluetooth/sdpd/log.h
@@ -1,7 +1,7 @@
/*-
* log.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/main.c b/usr.sbin/bluetooth/sdpd/main.c
index a041795e9846..e438d5b9e000 100644
--- a/usr.sbin/bluetooth/sdpd/main.c
+++ b/usr.sbin/bluetooth/sdpd/main.c
@@ -1,7 +1,7 @@
/*-
* main.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/nap.c b/usr.sbin/bluetooth/sdpd/nap.c
index 16054af657fe..529bfd528372 100644
--- a/usr.sbin/bluetooth/sdpd/nap.c
+++ b/usr.sbin/bluetooth/sdpd/nap.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/opush.c b/usr.sbin/bluetooth/sdpd/opush.c
index 91e08af30d4d..b2a7255c5da4 100644
--- a/usr.sbin/bluetooth/sdpd/opush.c
+++ b/usr.sbin/bluetooth/sdpd/opush.c
@@ -1,7 +1,7 @@
/*-
* opush.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/panu.c b/usr.sbin/bluetooth/sdpd/panu.c
index 353c28709e03..e0498e89a185 100644
--- a/usr.sbin/bluetooth/sdpd/panu.c
+++ b/usr.sbin/bluetooth/sdpd/panu.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/profile.c b/usr.sbin/bluetooth/sdpd/profile.c
index cef9a03ceea6..1b576e44d91e 100644
--- a/usr.sbin/bluetooth/sdpd/profile.c
+++ b/usr.sbin/bluetooth/sdpd/profile.c
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/profile.h b/usr.sbin/bluetooth/sdpd/profile.h
index 82e0e37f853d..b8c5cda7d6a9 100644
--- a/usr.sbin/bluetooth/sdpd/profile.h
+++ b/usr.sbin/bluetooth/sdpd/profile.h
@@ -3,7 +3,7 @@
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/provider.c b/usr.sbin/bluetooth/sdpd/provider.c
index 532cdac8cd9f..2f7ed67f1851 100644
--- a/usr.sbin/bluetooth/sdpd/provider.c
+++ b/usr.sbin/bluetooth/sdpd/provider.c
@@ -1,7 +1,7 @@
/*-
* provider.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/provider.h b/usr.sbin/bluetooth/sdpd/provider.h
index 6f6bed3e820a..eeb63ef1ba88 100644
--- a/usr.sbin/bluetooth/sdpd/provider.h
+++ b/usr.sbin/bluetooth/sdpd/provider.h
@@ -1,7 +1,7 @@
/*-
* provider.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/sar.c b/usr.sbin/bluetooth/sdpd/sar.c
index ce911911b503..99d63e4e7fff 100644
--- a/usr.sbin/bluetooth/sdpd/sar.c
+++ b/usr.sbin/bluetooth/sdpd/sar.c
@@ -1,7 +1,7 @@
/*-
* sar.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/scr.c b/usr.sbin/bluetooth/sdpd/scr.c
index b3442915341f..3f2b7882044e 100644
--- a/usr.sbin/bluetooth/sdpd/scr.c
+++ b/usr.sbin/bluetooth/sdpd/scr.c
@@ -1,7 +1,7 @@
/*-
* scr.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/sd.c b/usr.sbin/bluetooth/sdpd/sd.c
index e69e3366fa4c..2ee22084f8c4 100644
--- a/usr.sbin/bluetooth/sdpd/sd.c
+++ b/usr.sbin/bluetooth/sdpd/sd.c
@@ -1,7 +1,7 @@
/*-
* sd.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c
index 6910807953f5..dcca8d15b838 100644
--- a/usr.sbin/bluetooth/sdpd/server.c
+++ b/usr.sbin/bluetooth/sdpd/server.c
@@ -1,7 +1,7 @@
/*-
* server.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/server.h b/usr.sbin/bluetooth/sdpd/server.h
index 01629e89a789..3fd8e59bcf21 100644
--- a/usr.sbin/bluetooth/sdpd/server.h
+++ b/usr.sbin/bluetooth/sdpd/server.h
@@ -1,7 +1,7 @@
/*-
* server.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/sp.c b/usr.sbin/bluetooth/sdpd/sp.c
index a909cd181ed1..ed911e7d6e56 100644
--- a/usr.sbin/bluetooth/sdpd/sp.c
+++ b/usr.sbin/bluetooth/sdpd/sp.c
@@ -1,7 +1,7 @@
/*-
* sp.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/srr.c b/usr.sbin/bluetooth/sdpd/srr.c
index 4f031f5933b1..01ec2bdf1c99 100644
--- a/usr.sbin/bluetooth/sdpd/srr.c
+++ b/usr.sbin/bluetooth/sdpd/srr.c
@@ -1,7 +1,7 @@
/*-
* srr.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/ssar.c b/usr.sbin/bluetooth/sdpd/ssar.c
index 68cfa2facd21..594c410c9f46 100644
--- a/usr.sbin/bluetooth/sdpd/ssar.c
+++ b/usr.sbin/bluetooth/sdpd/ssar.c
@@ -1,7 +1,7 @@
/*-
* ssar.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/ssr.c b/usr.sbin/bluetooth/sdpd/ssr.c
index 939283dbb809..f176ec77d8b4 100644
--- a/usr.sbin/bluetooth/sdpd/ssr.c
+++ b/usr.sbin/bluetooth/sdpd/ssr.c
@@ -1,7 +1,7 @@
/*-
* ssr.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/sur.c b/usr.sbin/bluetooth/sdpd/sur.c
index ca561f693e1c..8348240fa938 100644
--- a/usr.sbin/bluetooth/sdpd/sur.c
+++ b/usr.sbin/bluetooth/sdpd/sur.c
@@ -1,7 +1,7 @@
/*-
* sur.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/uuid-private.h b/usr.sbin/bluetooth/sdpd/uuid-private.h
index 7f3d299e8dbf..7a8f96f049df 100644
--- a/usr.sbin/bluetooth/sdpd/uuid-private.h
+++ b/usr.sbin/bluetooth/sdpd/uuid-private.h
@@ -1,7 +1,7 @@
/*-
* uuid-private.h
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/bluetooth/sdpd/uuid.c b/usr.sbin/bluetooth/sdpd/uuid.c
index 3d41ea3e15b3..e3adba047e48 100644
--- a/usr.sbin/bluetooth/sdpd/uuid.c
+++ b/usr.sbin/bluetooth/sdpd/uuid.c
@@ -1,7 +1,7 @@
/*-
* uuid.c
*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 16bc46b5ec12..bccab173e2fb 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Luigi Rizzo
* Copyright (c) 1999 Robert Nordier
diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c
index 81d83f982e30..492558a978bf 100644
--- a/usr.sbin/bsdinstall/distextract/distextract.c
+++ b/usr.sbin/bsdinstall/distextract/distextract.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c
index 5f262343720e..3b348f6e6926 100644
--- a/usr.sbin/bsdinstall/distfetch/distfetch.c
+++ b/usr.sbin/bsdinstall/distfetch/distfetch.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
diff --git a/usr.sbin/bsdinstall/partedit/diskeditor.c b/usr.sbin/bsdinstall/partedit/diskeditor.c
index 1679def32a19..420a684edc31 100644
--- a/usr.sbin/bsdinstall/partedit/diskeditor.c
+++ b/usr.sbin/bsdinstall/partedit/diskeditor.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/diskeditor.h b/usr.sbin/bsdinstall/partedit/diskeditor.h
index 186dc3146ced..bf742af5d1ae 100644
--- a/usr.sbin/bsdinstall/partedit/diskeditor.h
+++ b/usr.sbin/bsdinstall/partedit/diskeditor.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c
index f95cc514903b..8e963715475f 100644
--- a/usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index 52c5d7f649cc..8fb9ce68dad8 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index 84f7ef032ba9..f8a0caf335d0 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
index 5c0405922d21..98a3ab18aba9 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.h
+++ b/usr.sbin/bsdinstall/partedit/partedit.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/partedit_generic.c b/usr.sbin/bsdinstall/partedit/partedit_generic.c
index e25784592a9b..a690ff2e317b 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_generic.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_generic.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
index 5a3041df5b0c..0a2a34131f6a 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index 6983188ba34f..5a0fd5b66950 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsdinstall/partedit/scripted.c b/usr.sbin/bsdinstall/partedit/scripted.c
index 37ac6de131b5..5bd58fcf6dc7 100644
--- a/usr.sbin/bsdinstall/partedit/scripted.c
+++ b/usr.sbin/bsdinstall/partedit/scripted.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Nathan Whitehorn
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
index ae106015b562..849e32832e14 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
index a9986874b308..f4ecefe9b72a 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
index 650b16ff7714..3e6e4ae51bb3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
index 1e87406a9a27..06a023fc7233 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
index 65f7b8e85cc8..3d93bfb5e06b 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
index 0f5dd34f51e5..5b4eb2df3de2 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index f30cb71816bf..bcf0a4eb6347 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
index 402a87852348..a7099eca7d83 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Mikolaj Golub <trociny@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index 4ef35ac1eec2..839ed66e3cfd 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Philip Paeps <philip@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
index aaa2b3071352..0b690dbe84dc 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
index f5fce0e3a01f..4f8ce6c30966 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
index 3ac2d63d105d..ae871f0e3b5e 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 The FreeBSD Foundation
*
diff --git a/usr.sbin/btxld/btx.h b/usr.sbin/btxld/btx.h
index 54b165a4fc92..e6a975fe519c 100644
--- a/usr.sbin/btxld/btx.h
+++ b/usr.sbin/btxld/btx.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c
index 931a224fe998..5ce24a42b216 100644
--- a/usr.sbin/btxld/btxld.c
+++ b/usr.sbin/btxld/btxld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c
index 115329e55a16..29229e6f7b6c 100644
--- a/usr.sbin/btxld/elfh.c
+++ b/usr.sbin/btxld/elfh.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
diff --git a/usr.sbin/btxld/elfh.h b/usr.sbin/btxld/elfh.h
index 03b7d959acd4..553dde4fe09a 100644
--- a/usr.sbin/btxld/elfh.h
+++ b/usr.sbin/btxld/elfh.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8
index 8ca2cd37dee5..4387745462f9 100644
--- a/usr.sbin/certctl/certctl.8
+++ b/usr.sbin/certctl/certctl.8
@@ -1,5 +1,5 @@
.\"
-.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+.\" SPDX-License-Identifier: BSD-2-Clause
.\"
.\" Copyright 2018 Allan Jude <allanjude@freebsd.org>
.\"
diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index 1a491cf3a047..fb966df95c55 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2018 Allan Jude <allanjude@freebsd.org>
#
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index d3a0bc313a5f..b64392dfb771 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Robert Nordier
* All rights reserved.
diff --git a/usr.sbin/clear_locks/clear_locks.c b/usr.sbin/clear_locks/clear_locks.c
index af4132c27ad0..9479a607e370 100644
--- a/usr.sbin/clear_locks/clear_locks.c
+++ b/usr.sbin/clear_locks/clear_locks.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/usr.sbin/cpucontrol/amd.c b/usr.sbin/cpucontrol/amd.c
index 9191f261564b..6dedba5a5257 100644
--- a/usr.sbin/cpucontrol/amd.c
+++ b/usr.sbin/cpucontrol/amd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/amd.h b/usr.sbin/cpucontrol/amd.h
index dd836874ab3d..b9496972317d 100644
--- a/usr.sbin/cpucontrol/amd.h
+++ b/usr.sbin/cpucontrol/amd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c
index 09948cc95d6c..467b901a5caa 100644
--- a/usr.sbin/cpucontrol/cpucontrol.c
+++ b/usr.sbin/cpucontrol/cpucontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2011 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/cpucontrol.h b/usr.sbin/cpucontrol/cpucontrol.h
index 8620d5ade19d..857dc66180ac 100644
--- a/usr.sbin/cpucontrol/cpucontrol.h
+++ b/usr.sbin/cpucontrol/cpucontrol.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/intel.c b/usr.sbin/cpucontrol/intel.c
index f4700898d5eb..215c034462e0 100644
--- a/usr.sbin/cpucontrol/intel.c
+++ b/usr.sbin/cpucontrol/intel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/intel.h b/usr.sbin/cpucontrol/intel.h
index a30fc505cb0b..031f1a7abbfb 100644
--- a/usr.sbin/cpucontrol/intel.h
+++ b/usr.sbin/cpucontrol/intel.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006, 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/via.c b/usr.sbin/cpucontrol/via.c
index b03790a0b4df..0a233b8b50b2 100644
--- a/usr.sbin/cpucontrol/via.c
+++ b/usr.sbin/cpucontrol/via.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/cpucontrol/via.h b/usr.sbin/cpucontrol/via.h
index 4427ff3885e1..5850b183dcae 100644
--- a/usr.sbin/cpucontrol/via.h
+++ b/usr.sbin/cpucontrol/via.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Fabien Thomas <fabient@FreeBSD.org>.
* All rights reserved.
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index 7705073958df..155a9b3e3a75 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004 Silicon Graphics International Corp.
* Copyright (c) 1997-2007 Kenneth D. Merry
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index 7ee381de08a7..da8047104bc9 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h
index de2f480af30b..a5d475de5f89 100644
--- a/usr.sbin/ctld/ctld.h
+++ b/usr.sbin/ctld/ctld.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c
index 3a713c1afac0..50b0a2d0eeea 100644
--- a/usr.sbin/ctld/discovery.c
+++ b/usr.sbin/ctld/discovery.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/ctld/isns.c b/usr.sbin/ctld/isns.c
index 4d44ceaa05a9..63b8425e9b9e 100644
--- a/usr.sbin/ctld/isns.c
+++ b/usr.sbin/ctld/isns.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 7e5d2a386878..2202a780b31c 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003, 2004 Silicon Graphics International Corp.
* Copyright (c) 1997-2007 Kenneth D. Merry
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index c52733f7894a..40a647b68cd4 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y
index 2995dabb095f..0350f5534cf6 100644
--- a/usr.sbin/ctld/parse.y
+++ b/usr.sbin/ctld/parse.y
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/ctld/token.l b/usr.sbin/ctld/token.l
index 3a9f28f4e2af..b467ffdb9c77 100644
--- a/usr.sbin/ctld/token.l
+++ b/usr.sbin/ctld/token.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c
index d02530d1b808..34ad431f5bbf 100644
--- a/usr.sbin/ctld/uclparse.c
+++ b/usr.sbin/ctld/uclparse.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2015 iXsystems Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcb_common.c b/usr.sbin/cxgbetool/tcb_common.c
index c6c3fed19c3e..e40ecc787bd1 100644
--- a/usr.sbin/cxgbetool/tcb_common.c
+++ b/usr.sbin/cxgbetool/tcb_common.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcb_common.h b/usr.sbin/cxgbetool/tcb_common.h
index 60f2acfe0887..bc62042dfc51 100644
--- a/usr.sbin/cxgbetool/tcb_common.h
+++ b/usr.sbin/cxgbetool/tcb_common.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcbinfot4.c b/usr.sbin/cxgbetool/tcbinfot4.c
index 9ee72458d38d..e6f3aa6a3d25 100644
--- a/usr.sbin/cxgbetool/tcbinfot4.c
+++ b/usr.sbin/cxgbetool/tcbinfot4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcbinfot5.c b/usr.sbin/cxgbetool/tcbinfot5.c
index e15dc998c683..8b684fd31877 100644
--- a/usr.sbin/cxgbetool/tcbinfot5.c
+++ b/usr.sbin/cxgbetool/tcbinfot5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcbinfot6.c b/usr.sbin/cxgbetool/tcbinfot6.c
index d1f2c24ae7a6..5f8316c0d89d 100644
--- a/usr.sbin/cxgbetool/tcbinfot6.c
+++ b/usr.sbin/cxgbetool/tcbinfot6.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcbshowt4.c b/usr.sbin/cxgbetool/tcbshowt4.c
index 4237b64fb0b8..b92f89759090 100644
--- a/usr.sbin/cxgbetool/tcbshowt4.c
+++ b/usr.sbin/cxgbetool/tcbshowt4.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcbshowt5.c b/usr.sbin/cxgbetool/tcbshowt5.c
index 3f5aa8474226..f32b2e79b66c 100644
--- a/usr.sbin/cxgbetool/tcbshowt5.c
+++ b/usr.sbin/cxgbetool/tcbshowt5.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/cxgbetool/tcbshowt6.c b/usr.sbin/cxgbetool/tcbshowt6.c
index 2aa6a6afab56..ed9156d7c3e3 100644
--- a/usr.sbin/cxgbetool/tcbshowt6.c
+++ b/usr.sbin/cxgbetool/tcbshowt6.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Chelsio Communications, Inc.
* All rights reserved.
diff --git a/usr.sbin/daemon/tests/daemon_test.sh b/usr.sbin/daemon/tests/daemon_test.sh
index ab5d86e0e71b..c865e6df441b 100644
--- a/usr.sbin/daemon/tests/daemon_test.sh
+++ b/usr.sbin/daemon/tests/daemon_test.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2021 Axcient
#
diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c
index ee5ac0a1f7eb..ce35357162e5 100644
--- a/usr.sbin/devinfo/devinfo.c
+++ b/usr.sbin/devinfo/devinfo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000, 2001 Michael Smith
* Copyright (c) 2000 BSDi
diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c
index 28ae2dae49c4..3099a09805d4 100644
--- a/usr.sbin/dumpcis/main.c
+++ b/usr.sbin/dumpcis/main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
*
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index e0223123aae2..148aaf63c363 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2010-2013 Hudson River Trading LLC
# Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/extattrctl/extattrctl.c b/usr.sbin/extattrctl/extattrctl.c
index a8ac064bddf7..2d74573cfe7f 100644
--- a/usr.sbin/extattrctl/extattrctl.c
+++ b/usr.sbin/extattrctl/extattrctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999-2002 Robert N. M. Watson
* All rights reserved.
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index fc975eb87b3e..953076b5af93 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1994, 2001 by Joerg Wunsch, Dresden
* All rights reserved.
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 383609dc810c..60f00100a9fb 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
* All rights reserved.
diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c
index 58d8e670ee26..e58067334cd6 100644
--- a/usr.sbin/fdread/fdread.c
+++ b/usr.sbin/fdread/fdread.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Joerg Wunsch
*
diff --git a/usr.sbin/fdread/fdutil.c b/usr.sbin/fdread/fdutil.c
index 46cf3541e058..9466c485a856 100644
--- a/usr.sbin/fdread/fdutil.c
+++ b/usr.sbin/fdread/fdutil.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Joerg Wunsch
*
diff --git a/usr.sbin/fdread/fdutil.h b/usr.sbin/fdread/fdutil.h
index bb65748ec1d9..87152068f499 100644
--- a/usr.sbin/fdread/fdutil.h
+++ b/usr.sbin/fdread/fdutil.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Joerg Wunsch
*
diff --git a/usr.sbin/fifolog/fifolog_create/fifolog_create.c b/usr.sbin/fifolog/fifolog_create/fifolog_create.c
index 5bb4fe783e21..0c1a89cf2152 100644
--- a/usr.sbin/fifolog/fifolog_create/fifolog_create.c
+++ b/usr.sbin/fifolog/fifolog_create/fifolog_create.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c b/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
index 7d6fdbff2143..391cb93bb8ab 100644
--- a/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
+++ b/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c b/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
index 1b6702d2ff43..26230d2304aa 100644
--- a/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
+++ b/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/fifolog.h b/usr.sbin/fifolog/lib/fifolog.h
index c8a10fd49dc7..216e6f709ae0 100644
--- a/usr.sbin/fifolog/lib/fifolog.h
+++ b/usr.sbin/fifolog/lib/fifolog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/fifolog_create.c b/usr.sbin/fifolog/lib/fifolog_create.c
index d3d1e4487f35..171eac549169 100644
--- a/usr.sbin/fifolog/lib/fifolog_create.c
+++ b/usr.sbin/fifolog/lib/fifolog_create.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/fifolog_int.c b/usr.sbin/fifolog/lib/fifolog_int.c
index d22bd4745e4f..8e201c00e9d4 100644
--- a/usr.sbin/fifolog/lib/fifolog_int.c
+++ b/usr.sbin/fifolog/lib/fifolog_int.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/fifolog_reader.c b/usr.sbin/fifolog/lib/fifolog_reader.c
index 1ef6a4e2048f..00ab70f40bb8 100644
--- a/usr.sbin/fifolog/lib/fifolog_reader.c
+++ b/usr.sbin/fifolog/lib/fifolog_reader.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/fifolog_write.h b/usr.sbin/fifolog/lib/fifolog_write.h
index 841ec4a386bb..ade1d989c1e0 100644
--- a/usr.sbin/fifolog/lib/fifolog_write.h
+++ b/usr.sbin/fifolog/lib/fifolog_write.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/fifolog_write_poll.c b/usr.sbin/fifolog/lib/fifolog_write_poll.c
index cffe095d4d7b..8319c0fb89fc 100644
--- a/usr.sbin/fifolog/lib/fifolog_write_poll.c
+++ b/usr.sbin/fifolog/lib/fifolog_write_poll.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/libfifolog.h b/usr.sbin/fifolog/lib/libfifolog.h
index 46d20af46808..b92e76f5cb56 100644
--- a/usr.sbin/fifolog/lib/libfifolog.h
+++ b/usr.sbin/fifolog/lib/libfifolog.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/libfifolog_int.h b/usr.sbin/fifolog/lib/libfifolog_int.h
index 69cd73433195..ebbbdacc6e44 100644
--- a/usr.sbin/fifolog/lib/libfifolog_int.h
+++ b/usr.sbin/fifolog/lib/libfifolog_int.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008
* All rights reserved.
diff --git a/usr.sbin/fifolog/lib/miniobj.h b/usr.sbin/fifolog/lib/miniobj.h
index 3edc42c8ff5e..0848d77c4743 100644
--- a/usr.sbin/fifolog/lib/miniobj.h
+++ b/usr.sbin/fifolog/lib/miniobj.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2008 Poul-Henning Kamp
* All rights reserved.
diff --git a/usr.sbin/flowctl/flowctl.c b/usr.sbin/flowctl/flowctl.c
index 66c6431d00bc..9385ea566c70 100644
--- a/usr.sbin/flowctl/flowctl.c
+++ b/usr.sbin/flowctl/flowctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
* Copyright (c) 2001-2003 Roman V. Palagin <romanp@unshadow.net>
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index cbc153fc1af2..ea4320ec25be 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2004-2007 Colin Percival
# All rights reserved
diff --git a/usr.sbin/fstyp/befs.c b/usr.sbin/fstyp/befs.c
index 352fe7d4c296..fd412c8fe498 100644
--- a/usr.sbin/fstyp/befs.c
+++ b/usr.sbin/fstyp/befs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Miguel Gocobachi
*
diff --git a/usr.sbin/fstyp/tests/fstyp_test.sh b/usr.sbin/fstyp/tests/fstyp_test.sh
index 81a549629dd7..81c86d0beebc 100755
--- a/usr.sbin/fstyp/tests/fstyp_test.sh
+++ b/usr.sbin/fstyp/tests/fstyp_test.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2015 Alan Somers
#
diff --git a/usr.sbin/gpioctl/gpioctl.c b/usr.sbin/gpioctl/gpioctl.c
index 7adca26bbf28..2b351d2ad56f 100644
--- a/usr.sbin/gpioctl/gpioctl.c
+++ b/usr.sbin/gpioctl/gpioctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2014, Rui Paulo <rpaulo@FreeBSD.org>
diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c
index 92ecd8faaddb..2bc839b7a2ea 100644
--- a/usr.sbin/gssd/gssd.c
+++ b/usr.sbin/gssd/gssd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/usr.sbin/i2c/i2c.c b/usr.sbin/i2c/i2c.c
index 0fcdd56e7373..743740df9d39 100644
--- a/usr.sbin/i2c/i2c.c
+++ b/usr.sbin/i2c/i2c.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2008-2009 Semihalf, Michal Hajduk and Bartlomiej Sieka
* All rights reserved.
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index a2302ee62eef..b9e0f9899d34 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1983, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c
index 942d4a4bc408..590490542b62 100644
--- a/usr.sbin/iscsid/discovery.c
+++ b/usr.sbin/iscsid/discovery.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
index 0c1967e0a595..72770b675731 100644
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h
index 42343c0556ae..caac34e1c1dd 100644
--- a/usr.sbin/iscsid/iscsid.h
+++ b/usr.sbin/iscsid/iscsid.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index 264bcb48104b..dc69f00fbaa7 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 The FreeBSD Foundation
*
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index 6b23af25b01c..eee06b3f74a3 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 James Gritton
* All rights reserved.
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index 4cf28820452a..cbf5859b1329 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 James Gritton
* All rights reserved.
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 63096146f176..02eb957a2d45 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2009-2012 James Gritton
diff --git a/usr.sbin/jail/jaillex.l b/usr.sbin/jail/jaillex.l
index cb758b237b46..1dcf5bef5358 100644
--- a/usr.sbin/jail/jaillex.l
+++ b/usr.sbin/jail/jaillex.l
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 James Gritton
* All rights reserved.
diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h
index 0ed0755f74b6..00865185fbd1 100644
--- a/usr.sbin/jail/jailp.h
+++ b/usr.sbin/jail/jailp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 James Gritton.
* All rights reserved.
diff --git a/usr.sbin/jail/jailparse.y b/usr.sbin/jail/jailparse.y
index ff673c72695a..9426444f0d09 100644
--- a/usr.sbin/jail/jailparse.y
+++ b/usr.sbin/jail/jailparse.y
@@ -1,6 +1,6 @@
%{
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 James Gritton
* All rights reserved.
diff --git a/usr.sbin/jail/state.c b/usr.sbin/jail/state.c
index 2bb93d8054b2..5b0c62842061 100644
--- a/usr.sbin/jail/state.c
+++ b/usr.sbin/jail/state.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 James Gritton
* All rights reserved.
diff --git a/usr.sbin/jail/tests/jail_basic_test.sh b/usr.sbin/jail/tests/jail_basic_test.sh
index ba691cb9b05a..0eedec65e5f9 100755
--- a/usr.sbin/jail/tests/jail_basic_test.sh
+++ b/usr.sbin/jail/tests/jail_basic_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Michael Zhilin
#
diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c
index 83a60816afd3..30c9e88363ee 100644
--- a/usr.sbin/jexec/jexec.c
+++ b/usr.sbin/jexec/jexec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2008 Bjoern A. Zeeb <bz@FreeBSD.org>
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 374ee14bf080..8773df3cef1c 100644
--- a/usr.sbin/jls/jls.c
+++ b/usr.sbin/jls/jls.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2008 Bjoern A. Zeeb <bz@FreeBSD.org>
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 44f34f9a4f3a..4f3be144132b 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h
index a852a30bd3c0..356a1db7f574 100644
--- a/usr.sbin/kbdcontrol/lex.h
+++ b/usr.sbin/kbdcontrol/lex.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index 0568758d3708..c8f95277786d 100644
--- a/usr.sbin/kbdcontrol/lex.l
+++ b/usr.sbin/kbdcontrol/lex.l
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index f5d8a1e25e3c..5b2b9dbffab1 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Jonathan Belson <jon@witchspace.com>
* All rights reserved.
diff --git a/usr.sbin/kbdmap/kbdmap.h b/usr.sbin/kbdmap/kbdmap.h
index 1d33b9ab9d50..120879fdf5d1 100644
--- a/usr.sbin/kbdmap/kbdmap.h
+++ b/usr.sbin/kbdmap/kbdmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002 Jonathan Belson <jon@witchspace.com>
* All rights reserved.
diff --git a/usr.sbin/kldxref/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c
index 270f27ad8bfa..ccffe888ab8f 100644
--- a/usr.sbin/kldxref/ef_amd64.c
+++ b/usr.sbin/kldxref/ef_amd64.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* Copyright 1996-1998 John D. Polstra.
diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c
index 34bc9ad59c47..8f339b3540b8 100644
--- a/usr.sbin/kldxref/ef_i386.c
+++ b/usr.sbin/kldxref/ef_i386.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* Copyright 1996-1998 John D. Polstra.
diff --git a/usr.sbin/kldxref/ef_mips.c b/usr.sbin/kldxref/ef_mips.c
index cf02eb203518..6f61896950d8 100644
--- a/usr.sbin/kldxref/ef_mips.c
+++ b/usr.sbin/kldxref/ef_mips.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
*
diff --git a/usr.sbin/kldxref/ef_nop.c b/usr.sbin/kldxref/ef_nop.c
index 420dba5ccdc3..9bd2f91e7f06 100644
--- a/usr.sbin/kldxref/ef_nop.c
+++ b/usr.sbin/kldxref/ef_nop.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c
index 45eca477abcd..8847ff070aaa 100644
--- a/usr.sbin/kldxref/ef_powerpc.c
+++ b/usr.sbin/kldxref/ef_powerpc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Peter Grehan.
* Copyright 1996-1998 John D. Polstra.
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index 25a5eb5941bf..a6bfbbb11c86 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.h b/usr.sbin/lpr/chkprintcap/skimprintcap.h
index 29b5627458a9..c161234737bf 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.h
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c
index 15fed7bc32ef..3d529b2c2a1f 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.c
+++ b/usr.sbin/lpr/common_source/ctlinfo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001,2011 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/common_source/ctlinfo.h b/usr.sbin/lpr/common_source/ctlinfo.h
index 5966485cb365..978efec0e926 100644
--- a/usr.sbin/lpr/common_source/ctlinfo.h
+++ b/usr.sbin/lpr/common_source/ctlinfo.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2001,2011 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h
index cadef37f0c3e..091a84baea54 100644
--- a/usr.sbin/lpr/common_source/lp.cdefs.h
+++ b/usr.sbin/lpr/common_source/lp.cdefs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2003,2013 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c
index 6d7379e24fa8..5dd860becef2 100644
--- a/usr.sbin/lpr/common_source/matchjobs.c
+++ b/usr.sbin/lpr/common_source/matchjobs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2002,2011 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/common_source/matchjobs.h b/usr.sbin/lpr/common_source/matchjobs.h
index 98de13bdb7bf..4a3073db9f29 100644
--- a/usr.sbin/lpr/common_source/matchjobs.h
+++ b/usr.sbin/lpr/common_source/matchjobs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2002 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
index 2baee03ccb64..4e6de53d9632 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
+++ b/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1999 by Andrey A. Chernov, Moscow, Russia.
* (C) 18 Sep 1999, Alex G. Bulushev (bag@demos.su)
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
index 9bbeb81ac5e1..dc6e38a06510 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
+++ b/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1993-98 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index 26c4d4fb5bcf..1f5420c03114 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2002 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
index 4272299ce135..d3279f48c6ba 100644
--- a/usr.sbin/makefs/mtree.c
+++ b/usr.sbin/makefs/mtree.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011 Marcel Moolenaar
* All rights reserved.
diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index 0b345b9c65e9..34b0cb452714 100644
--- a/usr.sbin/memcontrol/memcontrol.c
+++ b/usr.sbin/memcontrol/memcontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/mfiutil/mfi_bbu.c b/usr.sbin/mfiutil/mfi_bbu.c
index 343d101661da..112d561e9419 100644
--- a/usr.sbin/mfiutil/mfi_bbu.c
+++ b/usr.sbin/mfiutil/mfi_bbu.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Sandvine Inc.
* All rights reserved.
diff --git a/usr.sbin/mfiutil/mfi_foreign.c b/usr.sbin/mfiutil/mfi_foreign.c
index ce4b8a704bea..9296699c8073 100644
--- a/usr.sbin/mfiutil/mfi_foreign.c
+++ b/usr.sbin/mfiutil/mfi_foreign.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 smh@freebsd.org
* All rights reserved.
diff --git a/usr.sbin/mfiutil/mfi_properties.c b/usr.sbin/mfiutil/mfi_properties.c
index f5affe14bd50..51e5d6f38076 100644
--- a/usr.sbin/mfiutil/mfi_properties.c
+++ b/usr.sbin/mfiutil/mfi_properties.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Yahoo!, Inc.
* All rights reserved.
diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh
index 1a1266553b3f..87416a668fbc 100755
--- a/usr.sbin/mixer/tests/mixer_test.sh
+++ b/usr.sbin/mixer/tests/mixer_test.sh
@@ -1,5 +1,5 @@
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2019 Mateusz Piotrowski <0mp@FreeBSD.org>
#
diff --git a/usr.sbin/mlxcontrol/command.c b/usr.sbin/mlxcontrol/command.c
index 9e2f5dd2a643..24f1c0821ef2 100644
--- a/usr.sbin/mlxcontrol/command.c
+++ b/usr.sbin/mlxcontrol/command.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/usr.sbin/mlxcontrol/config.c b/usr.sbin/mlxcontrol/config.c
index d236e5d585de..67866ad02970 100644
--- a/usr.sbin/mlxcontrol/config.c
+++ b/usr.sbin/mlxcontrol/config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/usr.sbin/mlxcontrol/interface.c b/usr.sbin/mlxcontrol/interface.c
index 41ec08dd94ea..6bd5a347877f 100644
--- a/usr.sbin/mlxcontrol/interface.c
+++ b/usr.sbin/mlxcontrol/interface.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h
index 79f7a1938de9..ad7891a1db70 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.h
+++ b/usr.sbin/mlxcontrol/mlxcontrol.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index 137c9e461954..fffd4a8708e0 100644
--- a/usr.sbin/mlxcontrol/util.c
+++ b/usr.sbin/mlxcontrol/util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Michael Smith
* All rights reserved.
diff --git a/usr.sbin/mptable/mptable.c b/usr.sbin/mptable/mptable.c
index 6c5efee766bf..f6d0630fb5d2 100644
--- a/usr.sbin/mptable/mptable.c
+++ b/usr.sbin/mptable/mptable.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c
index f50c1a631a0a..0b315b778b7b 100644
--- a/usr.sbin/mtest/mtest.c
+++ b/usr.sbin/mtest/mtest.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007-2009 Bruce Simpson.
* Copyright (c) 2000 Wilbert De Graaf.
diff --git a/usr.sbin/newsyslog/extern.h b/usr.sbin/newsyslog/extern.h
index 909da2ca7341..54d86b6135d3 100644
--- a/usr.sbin/newsyslog/extern.h
+++ b/usr.sbin/newsyslog/extern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* ------+---------+---------+---------+---------+---------+---------+---------*
* Copyright (c) 2003 - Garance Alistair Drosehn <gad@FreeBSD.org>.
diff --git a/usr.sbin/pciconf/err.c b/usr.sbin/pciconf/err.c
index 9092b62ef021..fc5cdbef7f70 100644
--- a/usr.sbin/pciconf/err.c
+++ b/usr.sbin/pciconf/err.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index 08e206b93511..b7b3018e0ae6 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
* Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
diff --git a/usr.sbin/pkg/config.h b/usr.sbin/pkg/config.h
index 87efd3c29e94..4325e5453e81 100644
--- a/usr.sbin/pkg/config.h
+++ b/usr.sbin/pkg/config.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2013 Baptiste Daroussin <bapt@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/pkg/dns_utils.c b/usr.sbin/pkg/dns_utils.c
index f3bde529daca..b656d1db011a 100644
--- a/usr.sbin/pkg/dns_utils.c
+++ b/usr.sbin/pkg/dns_utils.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2013 Baptiste Daroussin <bapt@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/pkg/dns_utils.h b/usr.sbin/pkg/dns_utils.h
index da1482577fe7..88cc42da89d2 100644
--- a/usr.sbin/pkg/dns_utils.h
+++ b/usr.sbin/pkg/dns_utils.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012 Baptiste Daroussin <bapt@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/pkg/hash.c b/usr.sbin/pkg/hash.c
index 9696738fcafc..b3e6334da6a2 100644
--- a/usr.sbin/pkg/hash.c
+++ b/usr.sbin/pkg/hash.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2014 Baptiste Daroussin <bapt@FreeBSD.org>
* Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
diff --git a/usr.sbin/pkg/hash.h b/usr.sbin/pkg/hash.h
index 786d4371ef32..2ade4b7e7a1f 100644
--- a/usr.sbin/pkg/hash.h
+++ b/usr.sbin/pkg/hash.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2023 Baptiste Daroussin <bapt@FreeBSD.org>
*
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index c5d97d46c2d6..a287e867dd3b 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012-2014 Baptiste Daroussin <bapt@FreeBSD.org>
* Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
diff --git a/usr.sbin/pmc/cmd_pmc.h b/usr.sbin/pmc/cmd_pmc.h
index cdec055a2036..a160035016b2 100644
--- a/usr.sbin/pmc/cmd_pmc.h
+++ b/usr.sbin/pmc/cmd_pmc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/usr.sbin/pmc/cmd_pmc_filter.cc b/usr.sbin/pmc/cmd_pmc_filter.cc
index 07027cb272f9..ecde5f053bdc 100644
--- a/usr.sbin/pmc/cmd_pmc_filter.cc
+++ b/usr.sbin/pmc/cmd_pmc_filter.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/usr.sbin/pmc/cmd_pmc_list.c b/usr.sbin/pmc/cmd_pmc_list.c
index 2e1117e326e6..46886c8f1fe2 100644
--- a/usr.sbin/pmc/cmd_pmc_list.c
+++ b/usr.sbin/pmc/cmd_pmc_list.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/usr.sbin/pmc/cmd_pmc_stat.c b/usr.sbin/pmc/cmd_pmc_stat.c
index 55d1f1ca7a3b..029807618117 100644
--- a/usr.sbin/pmc/cmd_pmc_stat.c
+++ b/usr.sbin/pmc/cmd_pmc_stat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/usr.sbin/pmc/cmd_pmc_summary.cc b/usr.sbin/pmc/cmd_pmc_summary.cc
index 16edc5c7c30e..771a09555794 100644
--- a/usr.sbin/pmc/cmd_pmc_summary.cc
+++ b/usr.sbin/pmc/cmd_pmc_summary.cc
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/usr.sbin/pmc/pmc.c b/usr.sbin/pmc/pmc.c
index a923e5c0c2a4..5f8e4ef809ec 100644
--- a/usr.sbin/pmc/pmc.c
+++ b/usr.sbin/pmc/pmc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018, Matthew Macy
*
diff --git a/usr.sbin/pmc/pmc_util.c b/usr.sbin/pmc/pmc_util.c
index 94f82a49ef36..7ca4b28ad4b7 100644
--- a/usr.sbin/pmc/pmc_util.c
+++ b/usr.sbin/pmc/pmc_util.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcannotate/pmcannotate.c b/usr.sbin/pmcannotate/pmcannotate.c
index f3ffeed92738..b9af29e28b8a 100644
--- a/usr.sbin/pmcannotate/pmcannotate.c
+++ b/usr.sbin/pmcannotate/pmcannotate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Nokia Corporation
* All rights reserved.
diff --git a/usr.sbin/pmccontrol/pmccontrol.c b/usr.sbin/pmccontrol/pmccontrol.c
index 70f716826223..d5afd0a472b3 100644
--- a/usr.sbin/pmccontrol/pmccontrol.c
+++ b/usr.sbin/pmccontrol/pmccontrol.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003,2004 Joseph Koshy
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.c b/usr.sbin/pmcstat/pmcpl_annotate.c
index 18d37c06e6c5..3a4076318aa6 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_annotate.h b/usr.sbin/pmcstat/pmcpl_annotate.h
index 35b6412b7165..cc58b8fc0ff1 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate.h
+++ b/usr.sbin/pmcstat/pmcpl_annotate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
index d6274e1f2b73..7c3f2c435bf2 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.h b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
index afd5209ee756..75983d266e53 100644
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.h
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c
index f6b662fdeb14..2df3aa675f52 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.c
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.h b/usr.sbin/pmcstat/pmcpl_callgraph.h
index c3da2a8f93fc..43883ee33352 100644
--- a/usr.sbin/pmcstat/pmcpl_callgraph.h
+++ b/usr.sbin/pmcstat/pmcpl_callgraph.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c
index b0ce18aae76e..26b6299731c7 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.c
+++ b/usr.sbin/pmcstat/pmcpl_calltree.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2012, Fabien Thomas
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_calltree.h b/usr.sbin/pmcstat/pmcpl_calltree.h
index bb73b6b6f3c0..16c41707a6c8 100644
--- a/usr.sbin/pmcstat/pmcpl_calltree.h
+++ b/usr.sbin/pmcstat/pmcpl_calltree.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Fabien Thomas
* All rights reserved.
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.c b/usr.sbin/pmcstat/pmcpl_gprof.c
index 535c94746959..f9897d52c248 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.c
+++ b/usr.sbin/pmcstat/pmcpl_gprof.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcpl_gprof.h b/usr.sbin/pmcstat/pmcpl_gprof.h
index 4ce59ddacc57..9307a60a9d46 100644
--- a/usr.sbin/pmcstat/pmcpl_gprof.h
+++ b/usr.sbin/pmcstat/pmcpl_gprof.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index 9e8d3b6994a8..4b2d55b9a114 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2008, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcstat.h b/usr.sbin/pmcstat/pmcstat.h
index 4e15ab90367a..3597ca43dbe6 100644
--- a/usr.sbin/pmcstat/pmcstat.h
+++ b/usr.sbin/pmcstat/pmcstat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c
index 71f3b6b9b14e..3f764da964cd 100644
--- a/usr.sbin/pmcstat/pmcstat_log.c
+++ b/usr.sbin/pmcstat/pmcstat_log.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcstat_log.h b/usr.sbin/pmcstat/pmcstat_log.h
index 20e64fcf9b9f..4b587713d835 100644
--- a/usr.sbin/pmcstat/pmcstat_log.h
+++ b/usr.sbin/pmcstat/pmcstat_log.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
diff --git a/usr.sbin/pmcstat/pmcstat_top.h b/usr.sbin/pmcstat/pmcstat_top.h
index f9173a4256c1..e220df6b0c9a 100644
--- a/usr.sbin/pmcstat/pmcstat_top.h
+++ b/usr.sbin/pmcstat/pmcstat_top.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2009, Fabien Thomas
* All rights reserved.
diff --git a/usr.sbin/pnfsdscopymr/pnfsdscopymr.c b/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
index 9526d04eabab..33dcd302ef73 100644
--- a/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
+++ b/usr.sbin/pnfsdscopymr/pnfsdscopymr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Rick Macklem
*
diff --git a/usr.sbin/pnfsdsfile/pnfsdsfile.c b/usr.sbin/pnfsdsfile/pnfsdsfile.c
index 944903c807e4..ca17586dd3bd 100644
--- a/usr.sbin/pnfsdsfile/pnfsdsfile.c
+++ b/usr.sbin/pnfsdsfile/pnfsdsfile.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Rick Macklem
*
diff --git a/usr.sbin/pnfsdskill/pnfsdskill.c b/usr.sbin/pnfsdskill/pnfsdskill.c
index 55bbde687553..dcca4a17b626 100644
--- a/usr.sbin/pnfsdskill/pnfsdskill.c
+++ b/usr.sbin/pnfsdskill/pnfsdskill.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2017 Rick Macklem
*
diff --git a/usr.sbin/portsnap/make_index/make_index.c b/usr.sbin/portsnap/make_index/make_index.c
index 642404b63605..6e153d5698d2 100644
--- a/usr.sbin/portsnap/make_index/make_index.c
+++ b/usr.sbin/portsnap/make_index/make_index.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 2005 Colin Percival
* All rights reserved
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index 9db381e99f86..c6b613cef3bb 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright 2004-2005 Colin Percival
# All rights reserved
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 2acb14503685..1dcc9ae38fe3 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2004 Colin Percival
* Copyright (c) 2005 Nate Lawson
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index dd5d5c0c91a4..74cdce265d78 100644
--- a/usr.sbin/ppp/acf.c
+++ b/usr.sbin/ppp/acf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/acf.h b/usr.sbin/ppp/acf.h
index 0ef231e34bf7..ea91f3347b58 100644
--- a/usr.sbin/ppp/acf.h
+++ b/usr.sbin/ppp/acf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/arp.h b/usr.sbin/ppp/arp.h
index c835e2049ec7..0ccd1fe7121e 100644
--- a/usr.sbin/ppp/arp.h
+++ b/usr.sbin/ppp/arp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 1ed8d953b87f..f5e9dde06d7d 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/async.h b/usr.sbin/ppp/async.h
index 5413e80d62a1..a848d89a06c8 100644
--- a/usr.sbin/ppp/async.h
+++ b/usr.sbin/ppp/async.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index 1fa4b7f194a6..b54129daf17d 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index 12638c79d010..a2dc96ee189a 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 1af2924b8d56..59cd673d737f 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index 6658c5616fa4..95600d110874 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/cbcp.c b/usr.sbin/ppp/cbcp.c
index 76d2e1d9bbf9..1c597bd21fb9 100644
--- a/usr.sbin/ppp/cbcp.c
+++ b/usr.sbin/ppp/cbcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/cbcp.h b/usr.sbin/ppp/cbcp.h
index 30c417b7ddfb..4f3db700eff8 100644
--- a/usr.sbin/ppp/cbcp.h
+++ b/usr.sbin/ppp/cbcp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index be9a2479e675..748a622edbfe 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/ccp.h b/usr.sbin/ppp/ccp.h
index ca072de7a842..570fa67b12b2 100644
--- a/usr.sbin/ppp/ccp.h
+++ b/usr.sbin/ppp/ccp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 61ba177b79e3..c9cb7e75f545 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index c7d145bd4c2f..520eda44d972 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index 37d143d12dc2..3995605e58db 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Gabor Kincses <gabor@acm.org>
* 1997 - 2001 Brian Somers <brian@Awfulhak.org>
diff --git a/usr.sbin/ppp/chap_ms.h b/usr.sbin/ppp/chap_ms.h
index 014a2849f137..95df825a6973 100644
--- a/usr.sbin/ppp/chap_ms.h
+++ b/usr.sbin/ppp/chap_ms.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Gabor Kincses <gabor@acm.org>
* 1997 - 2001 Brian Somers <brian@Awfulhak.org>
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index b7eebb387a94..86f53e19cd87 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/chat.h b/usr.sbin/ppp/chat.h
index 984f9bf04192..d2c9272f71f6 100644
--- a/usr.sbin/ppp/chat.h
+++ b/usr.sbin/ppp/chat.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index e126c31529d4..35df243d0cee 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/command.h b/usr.sbin/ppp/command.h
index 7a61fd655517..56290e8cc96d 100644
--- a/usr.sbin/ppp/command.h
+++ b/usr.sbin/ppp/command.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index ff81a0dc0288..40830b83800f 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 69116036b933..e9ba231ee86c 100644
--- a/usr.sbin/ppp/datalink.h
+++ b/usr.sbin/ppp/datalink.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index a2095dbe397d..202c8de86d77 100644
--- a/usr.sbin/ppp/deflate.c
+++ b/usr.sbin/ppp/deflate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/deflate.h b/usr.sbin/ppp/deflate.h
index 474c2228d5be..7e6f8f949b78 100644
--- a/usr.sbin/ppp/deflate.h
+++ b/usr.sbin/ppp/deflate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index 7f89ef8b9f9e..24a68ad1d1b9 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index 9efdaca3563c..350eed5dd5e0 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/descriptor.h b/usr.sbin/ppp/descriptor.h
index 506c12af2722..ce474b43e2ab 100644
--- a/usr.sbin/ppp/descriptor.h
+++ b/usr.sbin/ppp/descriptor.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index 2256a83636a5..35e9df86551d 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ether.h b/usr.sbin/ppp/ether.h
index c0c8c30a1d47..1d4ff8ea8d38 100644
--- a/usr.sbin/ppp/ether.h
+++ b/usr.sbin/ppp/ether.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index 2520532aec5b..c89674364bca 100644
--- a/usr.sbin/ppp/exec.c
+++ b/usr.sbin/ppp/exec.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/exec.h b/usr.sbin/ppp/exec.h
index 0bc5b41a302e..c6851b6168d3 100644
--- a/usr.sbin/ppp/exec.h
+++ b/usr.sbin/ppp/exec.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index 8dc894ab3618..2725f18fdaac 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/filter.h b/usr.sbin/ppp/filter.h
index 74af3f994952..242b4edcfd55 100644
--- a/usr.sbin/ppp/filter.h
+++ b/usr.sbin/ppp/filter.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 1d35bafa8bd4..fcbe5dba9353 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index 361f483e34c2..7e7dbfd6d4ed 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 57d1486d0312..b7b88ba6b0a0 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/hdlc.h b/usr.sbin/ppp/hdlc.h
index 9f51d090d68e..d1431ad237be 100644
--- a/usr.sbin/ppp/hdlc.h
+++ b/usr.sbin/ppp/hdlc.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/i4b.h b/usr.sbin/ppp/i4b.h
index a19658319382..69bb64a4a9d9 100644
--- a/usr.sbin/ppp/i4b.h
+++ b/usr.sbin/ppp/i4b.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 48ea7ce4a7f0..9f0183106ab9 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 83b34a80c88c..6c44fdc068e7 100644
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 858fb1502d27..a6bfe469ac63 100644
--- a/usr.sbin/ppp/iface.c
+++ b/usr.sbin/ppp/iface.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/iface.h b/usr.sbin/ppp/iface.h
index 04bb2c5a8f8a..d506aacc7d8a 100644
--- a/usr.sbin/ppp/iface.h
+++ b/usr.sbin/ppp/iface.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 8e5f7bcb4dda..6082e10ce295 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index db9e7b279521..e9585ac09642 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index e4426952c4dc..ae77776927bd 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index a6864d815781..c9ac43ab6b13 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index c96353054b2a..8f52372cb019 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/iplist.h b/usr.sbin/ppp/iplist.h
index e4bcea43ce4d..8d523132cf6b 100644
--- a/usr.sbin/ppp/iplist.h
+++ b/usr.sbin/ppp/iplist.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ipv6cp.c b/usr.sbin/ppp/ipv6cp.c
index 7f4c0c9277aa..88e85790da7b 100644
--- a/usr.sbin/ppp/ipv6cp.c
+++ b/usr.sbin/ppp/ipv6cp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ipv6cp.h b/usr.sbin/ppp/ipv6cp.h
index 390b2afc7bba..233c920ab0e5 100644
--- a/usr.sbin/ppp/ipv6cp.h
+++ b/usr.sbin/ppp/ipv6cp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/layer.h b/usr.sbin/ppp/layer.h
index 8d7382c35cc3..b88d15da5125 100644
--- a/usr.sbin/ppp/layer.h
+++ b/usr.sbin/ppp/layer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index d447c9ef8737..73a823c6a769 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index 05c66de2ee5f..8b5b4131947c 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index 0cc32f040802..9a668cc8abbb 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/link.h b/usr.sbin/ppp/link.h
index 72e4dd405ead..94331a3c133d 100644
--- a/usr.sbin/ppp/link.h
+++ b/usr.sbin/ppp/link.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 72f1ca9a9a91..d0231c082f7b 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index f5bbacefba94..17eff279354d 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index 787faeab880f..91ad480952f1 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 522f0abf35f7..d4596e157855 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 3545d4753fcb..b6abbbd0af61 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index e94c1f3c3f26..ad5b9f2ce4f0 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 5d0d27d123e3..64220ffe5c5e 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 81d1116132ef..3280abe6b620 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 91fdaf09a936..62d692fb52b9 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/mp.h b/usr.sbin/ppp/mp.h
index 7020275c3c0d..6f9dfa36d0ae 100644
--- a/usr.sbin/ppp/mp.h
+++ b/usr.sbin/ppp/mp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index 2589141625ab..4f5e16f6b2cf 100644
--- a/usr.sbin/ppp/mppe.c
+++ b/usr.sbin/ppp/mppe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Semen Ustimenko <semenu@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/mppe.h b/usr.sbin/ppp/mppe.h
index c9566e333d3d..e549ee2cb619 100644
--- a/usr.sbin/ppp/mppe.h
+++ b/usr.sbin/ppp/mppe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Semen Ustimenko <semenu@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index a413fbb878fa..9f9ecfcfc3e3 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* Brian Somers <brian@Awfulhak.org>
diff --git a/usr.sbin/ppp/nat_cmd.h b/usr.sbin/ppp/nat_cmd.h
index 40f4bc7ea71d..8d2dc993d85d 100644
--- a/usr.sbin/ppp/nat_cmd.h
+++ b/usr.sbin/ppp/nat_cmd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Charles Mott <cm@linktel.net>
* Brian Somers <brian@Awfulhak.org>
diff --git a/usr.sbin/ppp/ncp.c b/usr.sbin/ppp/ncp.c
index d9aaf2bc71bf..17bc5fee6dd2 100644
--- a/usr.sbin/ppp/ncp.c
+++ b/usr.sbin/ppp/ncp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h
index 70b00a422310..d3394945b008 100644
--- a/usr.sbin/ppp/ncp.h
+++ b/usr.sbin/ppp/ncp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c
index 4e086eb5e377..3f3a7bf59a39 100644
--- a/usr.sbin/ppp/ncpaddr.c
+++ b/usr.sbin/ppp/ncpaddr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ncpaddr.h b/usr.sbin/ppp/ncpaddr.h
index 72b9596c73fd..dadbefac14cb 100644
--- a/usr.sbin/ppp/ncpaddr.h
+++ b/usr.sbin/ppp/ncpaddr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/netgraph.c b/usr.sbin/ppp/netgraph.c
index 1a96ccc856e1..668073ae7d77 100644
--- a/usr.sbin/ppp/netgraph.c
+++ b/usr.sbin/ppp/netgraph.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/netgraph.h b/usr.sbin/ppp/netgraph.h
index 007c16d6c7a0..bc678e512ed3 100644
--- a/usr.sbin/ppp/netgraph.h
+++ b/usr.sbin/ppp/netgraph.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 01b2cb34db12..3949bf30a431 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index f9f685c913c9..a70311d632dd 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 270cfa29b93b..addf5e37bd12 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* Ian Donaldson <iand@labtam.labtam.oz.au>
diff --git a/usr.sbin/ppp/pred.h b/usr.sbin/ppp/pred.h
index 395c57d4603b..44956d515bba 100644
--- a/usr.sbin/ppp/pred.h
+++ b/usr.sbin/ppp/pred.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c
index 34e65d03b1ed..5b374074f643 100644
--- a/usr.sbin/ppp/probe.c
+++ b/usr.sbin/ppp/probe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/probe.h b/usr.sbin/ppp/probe.h
index de838a6d9e0b..42013fb6797b 100644
--- a/usr.sbin/ppp/probe.h
+++ b/usr.sbin/ppp/probe.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index 48c264ce4b8d..87ce264f106f 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index dbc1425dc74a..78969a469763 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 45c57b12c5bc..571cead43819 100644
--- a/usr.sbin/ppp/proto.c
+++ b/usr.sbin/ppp/proto.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/proto.h b/usr.sbin/ppp/proto.h
index e49cc91ab0e4..5f3e80899db0 100644
--- a/usr.sbin/ppp/proto.h
+++ b/usr.sbin/ppp/proto.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 92735e777ce1..f5fd1ad9a76e 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1999 Internet Business Solutions Ltd., Switzerland
* All rights reserved.
diff --git a/usr.sbin/ppp/radius.h b/usr.sbin/ppp/radius.h
index 5ffbbefefaee..d7b704adae63 100644
--- a/usr.sbin/ppp/radius.h
+++ b/usr.sbin/ppp/radius.h
@@ -1,5 +1,5 @@
/*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright 1999 Internet Business Solutions Ltd., Switzerland
* All rights reserved.
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index 72dbf65fef2b..51ae1e38d845 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/route.h b/usr.sbin/ppp/route.h
index c088752fe02e..ea779145558f 100644
--- a/usr.sbin/ppp/route.h
+++ b/usr.sbin/ppp/route.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 162eb445f07b..0b8da8192979 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/server.h b/usr.sbin/ppp/server.h
index b053ae253e60..3324b02283ef 100644
--- a/usr.sbin/ppp/server.h
+++ b/usr.sbin/ppp/server.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index c7b2f469826c..8a436f3e7263 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 - 1999, 2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/sig.h b/usr.sbin/ppp/sig.h
index 277584544a5b..7fbb06414d3e 100644
--- a/usr.sbin/ppp/sig.h
+++ b/usr.sbin/ppp/sig.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index a9703f8c7bdc..0f2ecdc8a91c 100644
--- a/usr.sbin/ppp/sync.c
+++ b/usr.sbin/ppp/sync.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/sync.h b/usr.sbin/ppp/sync.h
index acf7a837e6a4..ba720742da29 100644
--- a/usr.sbin/ppp/sync.h
+++ b/usr.sbin/ppp/sync.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index f7f871eef514..c3db583ea4f7 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/systems.h b/usr.sbin/ppp/systems.h
index 857f069d62c2..0bec98a31d84 100644
--- a/usr.sbin/ppp/systems.h
+++ b/usr.sbin/ppp/systems.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/tcp.c b/usr.sbin/ppp/tcp.c
index 13dbd22b5967..4052467d00ee 100644
--- a/usr.sbin/ppp/tcp.c
+++ b/usr.sbin/ppp/tcp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/tcp.h b/usr.sbin/ppp/tcp.h
index ad7a95441d44..6de032c9c64a 100644
--- a/usr.sbin/ppp/tcp.h
+++ b/usr.sbin/ppp/tcp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/tcpmss.c b/usr.sbin/ppp/tcpmss.c
index cbf85dbf2a09..e1ea06edc8b9 100644
--- a/usr.sbin/ppp/tcpmss.c
+++ b/usr.sbin/ppp/tcpmss.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Ruslan Ermilov and Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/tcpmss.h b/usr.sbin/ppp/tcpmss.h
index 1b84e28f61dd..17b218fcde65 100644
--- a/usr.sbin/ppp/tcpmss.h
+++ b/usr.sbin/ppp/tcpmss.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index 697223f1c85e..b5cd96d54e3e 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/throughput.h b/usr.sbin/ppp/throughput.h
index 8ece5adaa804..99483f0e4b93 100644
--- a/usr.sbin/ppp/throughput.h
+++ b/usr.sbin/ppp/throughput.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 581e2979f0d2..c30ab0732956 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001, 2009 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index c68733f9438f..a99b666df7cd 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index 66b8b576c685..fc7f47f863d5 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/tty.h b/usr.sbin/ppp/tty.h
index 8115b68ef6ec..314ffc32082c 100644
--- a/usr.sbin/ppp/tty.h
+++ b/usr.sbin/ppp/tty.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 66d7254aca71..e221d1edc94a 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index 720e538197dd..9155d03de6d4 100644
--- a/usr.sbin/ppp/tun.h
+++ b/usr.sbin/ppp/tun.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/ua.h b/usr.sbin/ppp/ua.h
index 9c13aabe6914..c5671f71fffe 100644
--- a/usr.sbin/ppp/ua.h
+++ b/usr.sbin/ppp/ua.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/udp.c b/usr.sbin/ppp/udp.c
index 3990b679b0a2..8acdd34c02bb 100644
--- a/usr.sbin/ppp/udp.c
+++ b/usr.sbin/ppp/udp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/udp.h b/usr.sbin/ppp/udp.h
index 5c251879a738..860a06b67472 100644
--- a/usr.sbin/ppp/udp.h
+++ b/usr.sbin/ppp/udp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 1b2ff64f474e..dac0f059f603 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 20465c4c8395..dc4f91b18ce4 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 129dc4fdf3c6..59cbcd0c0ffc 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
diff --git a/usr.sbin/pw/bitmap.c b/usr.sbin/pw/bitmap.c
index be82b2c792dd..b7767f025529 100644
--- a/usr.sbin/pw/bitmap.c
+++ b/usr.sbin/pw/bitmap.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h
index 570c678237d5..ffb681d9e877 100644
--- a/usr.sbin/pw/bitmap.h
+++ b/usr.sbin/pw/bitmap.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c
index 4e6ca8828b91..8ffca63bdb70 100644
--- a/usr.sbin/pw/cpdir.c
+++ b/usr.sbin/pw/cpdir.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/grupd.c b/usr.sbin/pw/grupd.c
index e98dd295183f..f29ea882ca83 100644
--- a/usr.sbin/pw/grupd.c
+++ b/usr.sbin/pw/grupd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/psdate.c b/usr.sbin/pw/psdate.c
index 8c833b5c69c7..a5b6842574cb 100644
--- a/usr.sbin/pw/psdate.c
+++ b/usr.sbin/pw/psdate.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h
index 29bfb3397f37..985d0d18cd50 100644
--- a/usr.sbin/pw/psdate.h
+++ b/usr.sbin/pw/psdate.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c
index 4f92034a5d20..5b30cdf221af 100644
--- a/usr.sbin/pw/pw.c
+++ b/usr.sbin/pw/pw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
index 1e09722a907c..fb1ba9a44f84 100644
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c
index b9b80f85cd48..0ec88f60eda1 100644
--- a/usr.sbin/pw/pw_conf.c
+++ b/usr.sbin/pw/pw_conf.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
index 838bafa3e8ba..277763041f0a 100644
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw_log.c b/usr.sbin/pw/pw_log.c
index 17e14d1e44ed..1dbffc8b5d9d 100644
--- a/usr.sbin/pw/pw_log.c
+++ b/usr.sbin/pw/pw_log.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw_nis.c b/usr.sbin/pw/pw_nis.c
index 4b70bc1de1f6..0126990d61cb 100644
--- a/usr.sbin/pw/pw_nis.c
+++ b/usr.sbin/pw/pw_nis.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 1b986e7c6985..9d2601d31f25 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index 192d588ab0cf..3ee1e794c4a5 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index ac91c9e4c1bb..068b830726da 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index b6f268baae5c..149ef3cad612 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c
index 66ec3f21423f..6032a4769cd9 100644
--- a/usr.sbin/pw/rm_r.c
+++ b/usr.sbin/pw/rm_r.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1996
* David L. Nugent. All rights reserved.
diff --git a/usr.sbin/pwm/pwm.c b/usr.sbin/pwm/pwm.c
index 441181917afd..4700904f8d5b 100644
--- a/usr.sbin/pwm/pwm.c
+++ b/usr.sbin/pwm/pwm.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Emmanuel Vadot <manu@FreeBSD.org>
*
diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
index caa3b5266e48..f08333b317ea 100644
--- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
+++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlscommon.c b/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
index f5b88ffd0166..6aeeb3ff5dea 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlscommon.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Rick Macklem
*
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlscommon.h b/usr.sbin/rpc.tlsservd/rpc.tlscommon.h
index ad7147339d51..070c4c50c0c3 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlscommon.h
+++ b/usr.sbin/rpc.tlsservd/rpc.tlscommon.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Rick Macklem
*
diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
index ffcb856643b9..a14ee811fd32 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
diff --git a/usr.sbin/rpc.umntall/mounttab.c b/usr.sbin/rpc.umntall/mounttab.c
index a0e0d7fb81e6..72032d96c1a9 100644
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Martin Blapp
* All rights reserved.
diff --git a/usr.sbin/rpc.umntall/mounttab.h b/usr.sbin/rpc.umntall/mounttab.h
index 904f2ec79b28..35c7f1854056 100644
--- a/usr.sbin/rpc.umntall/mounttab.h
+++ b/usr.sbin/rpc.umntall/mounttab.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Martin Blapp
* All rights reserved.
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.c b/usr.sbin/rpc.umntall/rpc.umntall.c
index 74df093e6d18..ce1d151fb0a7 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.c
+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1999 Martin Blapp
* All rights reserved.
diff --git a/usr.sbin/rtadvctl/rtadvctl.c b/usr.sbin/rtadvctl/rtadvctl.c
index 8bbd7afb6dd5..74bd7943f225 100644
--- a/usr.sbin/rtadvctl/rtadvctl.c
+++ b/usr.sbin/rtadvctl/rtadvctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 3414e209cecd..fd74cfd0e534 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -2,7 +2,7 @@
/* $KAME: advcap.h,v 1.5 2003/06/09 05:40:54 t-momose Exp $ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 1994,1995 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/usr.sbin/rtadvd/control.c b/usr.sbin/rtadvd/control.c
index 4ef2e8383450..ec6ceab63dd8 100644
--- a/usr.sbin/rtadvd/control.c
+++ b/usr.sbin/rtadvd/control.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/control.h b/usr.sbin/rtadvd/control.h
index 1086519948dc..0ef2a3aa04ed 100644
--- a/usr.sbin/rtadvd/control.h
+++ b/usr.sbin/rtadvd/control.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/control_client.c b/usr.sbin/rtadvd/control_client.c
index 64d7d68a89fa..745a8ef741cc 100644
--- a/usr.sbin/rtadvd/control_client.c
+++ b/usr.sbin/rtadvd/control_client.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/control_client.h b/usr.sbin/rtadvd/control_client.h
index d1af84dc7456..22cbc1153f26 100644
--- a/usr.sbin/rtadvd/control_client.h
+++ b/usr.sbin/rtadvd/control_client.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/control_server.c b/usr.sbin/rtadvd/control_server.c
index c6cf695ac36f..c76462d2e44b 100644
--- a/usr.sbin/rtadvd/control_server.c
+++ b/usr.sbin/rtadvd/control_server.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/rtadvd/control_server.h b/usr.sbin/rtadvd/control_server.h
index 072caa10a290..701805914241 100644
--- a/usr.sbin/rtadvd/control_server.h
+++ b/usr.sbin/rtadvd/control_server.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Hiroki Sato <hrs@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/sa/db.c b/usr.sbin/sa/db.c
index b0c9656d980a..e717ee02c20a 100644
--- a/usr.sbin/sa/db.c
+++ b/usr.sbin/sa/db.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2007 Diomidis Spinellis
* All rights reserved.
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh
index df2869f98a6c..42846af56f2a 100755
--- a/usr.sbin/service/service.sh
+++ b/usr.sbin/service/service.sh
@@ -2,7 +2,7 @@
# $FreeBSD$
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2009 Douglas Barton
# All rights reserved.
diff --git a/usr.sbin/setfmac/setfmac.c b/usr.sbin/setfmac/setfmac.c
index 15dc7ffc4dde..87a30f0486a8 100644
--- a/usr.sbin/setfmac/setfmac.c
+++ b/usr.sbin/setfmac/setfmac.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/usr.sbin/smbmsg/pathnames.h b/usr.sbin/smbmsg/pathnames.h
index d5a0a24fe755..dcb9c5babf13 100644
--- a/usr.sbin/smbmsg/pathnames.h
+++ b/usr.sbin/smbmsg/pathnames.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2004 Joerg Wunsch
* All Rights Reserved.
diff --git a/usr.sbin/smbmsg/smbmsg.c b/usr.sbin/smbmsg/smbmsg.c
index bd552bee3659..81f8085ffd73 100644
--- a/usr.sbin/smbmsg/smbmsg.c
+++ b/usr.sbin/smbmsg/smbmsg.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2004 Joerg Wunsch
* All Rights Reserved.
diff --git a/usr.sbin/snapinfo/snapinfo.c b/usr.sbin/snapinfo/snapinfo.c
index 9758979bc7e9..f5d9e42cecfd 100644
--- a/usr.sbin/snapinfo/snapinfo.c
+++ b/usr.sbin/snapinfo/snapinfo.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2005 Mark Santcroos <marks@freebsd.org>
*
diff --git a/usr.sbin/spkrtest/spkrtest.sh b/usr.sbin/spkrtest/spkrtest.sh
index 4acfb6750015..2c140fdcd33c 100644
--- a/usr.sbin/spkrtest/spkrtest.sh
+++ b/usr.sbin/spkrtest/spkrtest.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2002 The FreeBSD Project
# All rights reserved.
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 5c2555480d3f..4600c807a7df 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2018 Prodrive Technologies, https://prodrive-technologies.com/
* Author: Ed Schouten <ed@FreeBSD.org>
diff --git a/usr.sbin/traceroute/findsaddr-udp.c b/usr.sbin/traceroute/findsaddr-udp.c
index 57ecc27ce9cd..5db70ee2f4ed 100644
--- a/usr.sbin/traceroute/findsaddr-udp.c
+++ b/usr.sbin/traceroute/findsaddr-udp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/trim/trim.c b/usr.sbin/trim/trim.c
index a368f3ac799c..da036b45f5f5 100644
--- a/usr.sbin/trim/trim.c
+++ b/usr.sbin/trim/trim.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2019 Eugene Grosbein <eugen@FreeBSD.org>.
* Contains code written by Alan Somers <asomers@FreeBSD.org>.
diff --git a/usr.sbin/uathload/uathload.c b/usr.sbin/uathload/uathload.c
index 459dd31f1d74..5fe8654fec6f 100644
--- a/usr.sbin/uathload/uathload.c
+++ b/usr.sbin/uathload/uathload.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2006 Sam Leffler, Errno Consulting
* All rights reserved.
diff --git a/usr.sbin/uefisign/child.c b/usr.sbin/uefisign/child.c
index 2eda8a66fd04..00adb9945837 100644
--- a/usr.sbin/uefisign/child.c
+++ b/usr.sbin/uefisign/child.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/uefisign/magic.h b/usr.sbin/uefisign/magic.h
index a20aa6fb06fd..8853da63ec5f 100644
--- a/usr.sbin/uefisign/magic.h
+++ b/usr.sbin/uefisign/magic.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/uefisign/pe.c b/usr.sbin/uefisign/pe.c
index 6459321441d8..6c2f5a154b08 100644
--- a/usr.sbin/uefisign/pe.c
+++ b/usr.sbin/uefisign/pe.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/uefisign/uefisign.c
index 7eab934c3394..df9770d5bfee 100644
--- a/usr.sbin/uefisign/uefisign.c
+++ b/usr.sbin/uefisign/uefisign.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/uefisign/uefisign.h b/usr.sbin/uefisign/uefisign.h
index 0eb6adb84b9f..78d0bbe3fa3b 100644
--- a/usr.sbin/uefisign/uefisign.h
+++ b/usr.sbin/uefisign/uefisign.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2014 The FreeBSD Foundation
*
diff --git a/usr.sbin/ugidfw/ugidfw.c b/usr.sbin/ugidfw/ugidfw.c
index f748b4da77a3..4a8c2dc2118f 100644
--- a/usr.sbin/ugidfw/ugidfw.c
+++ b/usr.sbin/ugidfw/ugidfw.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
* All rights reserved.
diff --git a/usr.sbin/uhsoctl/uhsoctl.c b/usr.sbin/uhsoctl/uhsoctl.c
index 8e5f88da2b36..b9815ccc7d32 100644
--- a/usr.sbin/uhsoctl/uhsoctl.c
+++ b/usr.sbin/uhsoctl/uhsoctl.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Fredrik Lindberg
* All rights reserved.
diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh
index f725b566b650..4f8ecadf7a15 100755
--- a/usr.sbin/unbound/setup/local-unbound-setup.sh
+++ b/usr.sbin/unbound/setup/local-unbound-setup.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#-
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2013 Dag-Erling Smørgrav
# All rights reserved.
diff --git a/usr.sbin/usbconfig/dump.c b/usr.sbin/usbconfig/dump.c
index 4a52ab9fd85e..dbd5287551fc 100644
--- a/usr.sbin/usbconfig/dump.c
+++ b/usr.sbin/usbconfig/dump.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/usr.sbin/usbconfig/dump.h b/usr.sbin/usbconfig/dump.h
index d7fe12866282..d2935fe3924d 100644
--- a/usr.sbin/usbconfig/dump.h
+++ b/usr.sbin/usbconfig/dump.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
diff --git a/usr.sbin/usbconfig/usbconfig.c b/usr.sbin/usbconfig/usbconfig.c
index 81112d957bbb..ff0ef711d64f 100644
--- a/usr.sbin/usbconfig/usbconfig.c
+++ b/usr.sbin/usbconfig/usbconfig.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
*
diff --git a/usr.sbin/usbdump/usbdump.c b/usr.sbin/usbdump/usbdump.c
index 00d3b8e8913b..ec99f709958c 100644
--- a/usr.sbin/usbdump/usbdump.c
+++ b/usr.sbin/usbdump/usbdump.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2010 Weongyo Jeong <weongyo@freebsd.org>
* All rights reserved.
diff --git a/usr.sbin/utx/utx.c b/usr.sbin/utx/utx.c
index 75a3e00ef7e3..2bd7d89286ca 100644
--- a/usr.sbin/utx/utx.c
+++ b/usr.sbin/utx/utx.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2011-2012 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
diff --git a/usr.sbin/wake/wake.c b/usr.sbin/wake/wake.c
index ca600e1d9884..0281bf8deb9c 100644
--- a/usr.sbin/wake/wake.c
+++ b/usr.sbin/wake/wake.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2006, 2007, 2008, 2009, 2010 Marc Balmer <marc@msys.ch>
* Copyright (C) 2000 Eugene M. Kim. All rights reserved.
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index a926c0d25388..aa3806e1a9a4 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2003-2004 Sean M. Kelly <smkelly@FreeBSD.org>
* Copyright (c) 2013 iXsystems.com,
diff --git a/usr.sbin/wlandebug/wlandebug.c b/usr.sbin/wlandebug/wlandebug.c
index cc8698824880..2be5af130ff4 100644
--- a/usr.sbin/wlandebug/wlandebug.c
+++ b/usr.sbin/wlandebug/wlandebug.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.