From 4d846d260e2b9a3d4d0a701462568268cbfe7a5b Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 10 May 2023 09:40:58 -0600 Subject: spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix --- sys/dev/xen/blkback/blkback.c | 2 +- sys/dev/xen/control/control.c | 2 +- sys/dev/xen/netback/netback.c | 2 +- sys/dev/xen/netback/netback_unit_tests.c | 2 +- sys/dev/xen/netfront/netfront.c | 2 +- sys/dev/xen/timer/timer.h | 2 +- sys/dev/xen/timer/xen_timer.c | 2 +- sys/dev/xen/xenpci/xenpci.c | 2 +- sys/dev/xen/xenpci/xenpcivar.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sys/dev/xen') diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index 6a5f9631004e..a1b03ad479d5 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 c3408b6fb58a..666c45249d5c 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 3c6ebde3ee49..489b80774cdc 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 82af6ba89f11..162e295fd7c1 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 b833dfc0a42d..9a03300c70d3 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 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é * All rights reserved. diff --git a/sys/dev/xen/timer/xen_timer.c b/sys/dev/xen/timer/xen_timer.c index ef524e2e6d51..ac09347e2be8 100644 --- a/sys/dev/xen/timer/xen_timer.c +++ b/sys/dev/xen/timer/xen_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/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index 7dd69688a00e..e33bf5ea914a 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. -- cgit v1.2.3