git: eebd9d53665e - main - spdx: Simplify BSD-2-Clause AND BSD-2-Clause

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Warner Losh <imp_at_FreeBSD.org>
Date: Fri, 12 May 2023 16:44:54 UTC
The branch main has been updated by imp:

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

commit eebd9d53665e1b691ffada910b940b37b6f62cc4
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-05-10 15:40:58 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-05-12 16:44:04 +0000

    spdx: Simplify BSD-2-Clause AND BSD-2-Clause
    
    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
---
 include/wchar.h                        | 2 +-
 sys/arm/freescale/imx/imx51_ccm.c      | 2 +-
 sys/arm/freescale/imx/imx51_ccmreg.h   | 2 +-
 sys/arm/freescale/imx/imx51_ccmvar.h   | 2 +-
 sys/arm/freescale/imx/imx51_dpllreg.h  | 2 +-
 sys/arm/freescale/imx/imx51_ipuv3reg.h | 2 +-
 sys/arm/freescale/imx/imx51_tzicreg.h  | 2 +-
 sys/dev/iicbus/s35390a.c               | 2 +-
 sys/dev/mfi/mfi.c                      | 2 +-
 sys/dev/mfi/mfi_pci.c                  | 2 +-
 sys/dev/mfi/mfireg.h                   | 2 +-
 sys/dev/mfi/mfivar.h                   | 2 +-
 sys/dev/mii/gentbi.c                   | 2 +-
 sys/dev/mii/nsphy.c                    | 2 +-
 sys/dev/mii/nsphyter.c                 | 2 +-
 sys/dev/mii/qsphy.c                    | 2 +-
 sys/dev/usb/serial/ubsa.c              | 2 +-
 sys/dev/usb/serial/ubser.c             | 2 +-
 sys/dev/usb/serial/uchcom.c            | 2 +-
 sys/dev/usb/serial/ufoma.c             | 2 +-
 sys/dev/usb/serial/umodem.c            | 2 +-
 sys/dev/usb/serial/uplcom.c            | 2 +-
 sys/dev/usb/serial/usb_serial.c        | 2 +-
 sys/dev/usb/serial/usb_serial.h        | 2 +-
 sys/dev/xl/xlphy.c                     | 2 +-
 sys/netgraph/ng_ppp.c                  | 2 +-
 sys/netinet/libalias/alias_smedia.c    | 2 +-
 usr.sbin/bhyveload/bhyveload.c         | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/wchar.h b/include/wchar.h
index 147efb4dbf86..c0cf13c49a9e 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -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,
  * All rights reserved.
diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c
index 38555bba689c..8f52856991f5 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
+ * SPDX-License-Identifier: 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 504c6e9ef126..d14289ac4fdb 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
+ * SPDX-License-Identifier: 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 dc35f1bc7116..b58e78cb2c72 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
+ * SPDX-License-Identifier: 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 a98f255fb036..ca93934cbc86 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
+ * SPDX-License-Identifier: 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_ipuv3reg.h b/sys/arm/freescale/imx/imx51_ipuv3reg.h
index 16e52e405784..380e879e8f92 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
+ * SPDX-License-Identifier: 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_tzicreg.h b/sys/arm/freescale/imx/imx51_tzicreg.h
index 3311dfffb3d5..ac36f2c5277f 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
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2010  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c
index c6df70acfc67..c282ca034b3a 100644
--- a/sys/dev/iicbus/s35390a.c
+++ b/sys/dev/iicbus/s35390a.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2012 Yusuke Tanaka
  * All rights reserved.
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index d5c6d7257202..a69fc5b2ac81 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -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
  * All rights reserved.
diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c
index 0de7ab759d6e..6dfba2c916d9 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 AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2006 IronPort Systems
  * All rights reserved.
diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h
index dea3fce664b2..d649cc5aa9cb 100644
--- a/sys/dev/mfi/mfireg.h
+++ b/sys/dev/mfi/mfireg.h
@@ -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
  * All rights reserved.
diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h
index 72658d8a8aad..a3bb9a1bfdff 100644
--- a/sys/dev/mfi/mfivar.h
+++ b/sys/dev/mfi/mfivar.h
@@ -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
  * All rights reserved.
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index fcec0e9ede58..702012108283 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 2eb26f615d4a..c0841369e524 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 7fbb284163d1..887097c25ba1 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index aa6a6e503adf..544ac8117c75 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -2,7 +2,7 @@
 /*	NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp 	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c
index 3871beda091d..8c741ca07a16 100644
--- a/sys/dev/usb/serial/ubsa.c
+++ b/sys/dev/usb/serial/ubsa.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * 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 3005342ad3e4..7365d4d615b7 100644
--- a/sys/dev/usb/serial/ubser.c
+++ b/sys/dev/usb/serial/ubser.c
@@ -8,7 +8,7 @@
  */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * 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 9b73ba8c4324..146022369139 100644
--- a/sys/dev/usb/serial/uchcom.c
+++ b/sys/dev/usb/serial/uchcom.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2007, Takanori Watanabe
  * All rights reserved.
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index 8ed0381149ee..ba37de30544f 100644
--- a/sys/dev/usb/serial/ufoma.c
+++ b/sys/dev/usb/serial/ufoma.c
@@ -4,7 +4,7 @@
 __FBSDID("$FreeBSD$");
 #define UFOMA_HANDSFREE
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005, Takanori Watanabe All rights reserved.
  * Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index e5131f21373b..8b8b36ec6c4a 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -4,7 +4,7 @@
 __FBSDID("$FreeBSD$");
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * 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 b28d105eab12..96d3d036befa 100644
--- a/sys/dev/usb/serial/uplcom.c
+++ b/sys/dev/usb/serial/uplcom.c
@@ -4,7 +4,7 @@
 __FBSDID("$FreeBSD$");
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * 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/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c
index a6775be62c12..6179f69705ff 100644
--- a/sys/dev/usb/serial/usb_serial.c
+++ b/sys/dev/usb/serial/usb_serial.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * 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 306eb035c8cd..b2ec25141800 100644
--- a/sys/dev/usb/serial/usb_serial.h
+++ b/sys/dev/usb/serial/usb_serial.h
@@ -2,7 +2,7 @@
 /*	$FreeBSD$	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
  * All rights reserved.
diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c
index 0abfc09e4baf..6fb622933d58 100644
--- a/sys/dev/xl/xlphy.c
+++ b/sys/dev/xl/xlphy.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index 866560c9c7c9..bcacf7f3220a 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
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1996-2000 Whistle Communications, Inc.
  * All rights reserved.
diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c
index e7a15afebc6d..a591bc079dc5 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 AND BSD-2-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000 Whistle Communications, Inc.
  * All rights reserved.
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index d25715310cc7..d996a7a577a8 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -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.
  * All rights reserved.