system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

spdx: Simplify BSD-2-Clause AND BSD-2-Clause

Browse source 
After removing the -FreeBSD and -NetBSD, we're left with a nuber of
BSD-2-Clause AND BSD-2-Clause, so tidy that up.

Discussed with:		pfg
MFC After:		3 days
Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2023-05-10 09:40:58 -06:00
parent b61a573019
commit eebd9d5366
28 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/wchar.h
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause) * SPDX-License-Identifier: (BSD-2-Clause)
* *
* Copyright (c)1999 Citrus Project, * Copyright (c)1999 Citrus Project,
* All rights reserved. * All rights reserved.

2
sys/arm/freescale/imx/imx51_ccm.c
View file

@ -1,6 +1,6 @@
/* $NetBSD: imx51_ccm.c,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /* $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 * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved. * Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation. * Written by Hashimoto Kenichi for Genetec Corporation.

2
sys/arm/freescale/imx/imx51_ccmreg.h
View file

@ -1,6 +1,6 @@
/* $NetBSD: imx51_ccmreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /* $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 * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation. * Written by Hashimoto Kenichi for Genetec Corporation.

2
sys/arm/freescale/imx/imx51_ccmvar.h
View file

@ -1,6 +1,6 @@
/* $NetBSD: imx51_ccmvar.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /* $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 * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2012 Genetec Corporation. All rights reserved. * Copyright (c) 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation. * Written by Hashimoto Kenichi for Genetec Corporation.

2
sys/arm/freescale/imx/imx51_dpllreg.h
View file

@ -1,6 +1,6 @@
/* $NetBSD: imx51_dpllreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /* $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 * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2012 Genetec Corporation. All rights reserved. * Copyright (c) 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation. * Written by Hashimoto Kenichi for Genetec Corporation.

2
sys/arm/freescale/imx/imx51_ipuv3reg.h
View file

@ -1,6 +1,6 @@
/* $NetBSD: imx51_ipuv3reg.h,v 1.1 2012/04/17 10:19:57 bsh Exp $ */ /* $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 * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation. * Written by Hashimoto Kenichi for Genetec Corporation.

2
sys/arm/freescale/imx/imx51_tzicreg.h
View file

@ -1,6 +1,6 @@
/* $NetBSD: imx51_tzicreg.h,v 1.1 2010/11/13 07:11:03 bsh Exp $ */ /* $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 * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2010 Genetec Corporation. All rights reserved. * Copyright (c) 2010 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation. * Written by Hashimoto Kenichi for Genetec Corporation.

2
sys/dev/iicbus/s35390a.c
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2012 Yusuke Tanaka * Copyright (c) 2012 Yusuke Tanaka
* All rights reserved. * All rights reserved.

2
sys/dev/mfi/mfi.c
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2006 IronPort Systems * Copyright (c) 2006 IronPort Systems
* All rights reserved. * All rights reserved.

2
sys/dev/mfi/mfi_pci.c
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2006 IronPort Systems * Copyright (c) 2006 IronPort Systems
* All rights reserved. * All rights reserved.

2
sys/dev/mfi/mfireg.h
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2006 IronPort Systems * Copyright (c) 2006 IronPort Systems
* All rights reserved. * All rights reserved.

2
sys/dev/mfi/mfivar.h
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2006 IronPort Systems * Copyright (c) 2006 IronPort Systems
* All rights reserved. * All rights reserved.

2
sys/dev/mii/gentbi.c
View file

@ -1,7 +1,7 @@
/* $NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $ */ /* $NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.

2
sys/dev/mii/nsphy.c
View file

@ -1,7 +1,7 @@
/* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */ /* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.

2
sys/dev/mii/nsphyter.c
View file

@ -1,7 +1,7 @@
/* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */ /* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.

2
sys/dev/mii/qsphy.c
View file

@ -2,7 +2,7 @@
/* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */ /* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.

2
sys/dev/usb/serial/ubsa.c
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved. * All rights reserved.

2
sys/dev/usb/serial/ubser.c
View file

@ -8,7 +8,7 @@
*/ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved. * All rights reserved.

2
sys/dev/usb/serial/uchcom.c
View file

@ -1,7 +1,7 @@
/* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2007, Takanori Watanabe * Copyright (c) 2007, Takanori Watanabe
* All rights reserved. * All rights reserved.

2
sys/dev/usb/serial/ufoma.c
View file

@ -4,7 +4,7 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#define UFOMA_HANDSFREE #define UFOMA_HANDSFREE
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2005, Takanori Watanabe All rights reserved. * Copyright (c) 2005, Takanori Watanabe All rights reserved.
* Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org> * Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>

2
sys/dev/usb/serial/umodem.c
View file

@ -4,7 +4,7 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org> * Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
* *

2
sys/dev/usb/serial/uplcom.c
View file

@ -4,7 +4,7 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved. * All rights reserved.

2
sys/dev/usb/serial/usb_serial.c
View file

@ -1,7 +1,7 @@
/* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */ /* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2001-2003, 2005, 2008 * Copyright (c) 2001-2003, 2005, 2008
* Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. * Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.

2
sys/dev/usb/serial/usb_serial.h
View file

@ -2,7 +2,7 @@
/* $FreeBSD$ */ /* $FreeBSD$ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved. * All rights reserved.

2
sys/dev/xl/xlphy.c
View file

@ -1,7 +1,7 @@
/* $NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $ */ /* $NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.

2
sys/netgraph/ng_ppp.c
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 1996-2000 Whistle Communications, Inc. * Copyright (c) 1996-2000 Whistle Communications, Inc.
* All rights reserved. * All rights reserved.

2
sys/netinet/libalias/alias_smedia.c
View file

@ -1,7 +1,7 @@
/*- /*-
* alias_smedia.c * alias_smedia.c
* *
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2000 Whistle Communications, Inc. * Copyright (c) 2000 Whistle Communications, Inc.
* All rights reserved. * All rights reserved.

2
usr.sbin/bhyveload/bhyveload.c
View file

@ -1,5 +1,5 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
* *
* Copyright (c) 2011 NetApp, Inc. * Copyright (c) 2011 NetApp, Inc.
* All rights reserved. * All rights reserved.