svn commit: r356142 - in head/sys: dev/ofw sys

[Rodney W. Grimes]

> Author: pfg
> Date: Sat Dec 28 02:58:30 2019
> New Revision: 356142
> URL: https://svnweb.freebsd.org/changeset/base/356142
> 
> Log:
>   SPDX: update some tags with two licenses.
> 
> Modified:
>   head/sys/dev/ofw/openfirm.h
>   head/sys/sys/sched.h
> 
> Modified: head/sys/dev/ofw/openfirm.h
> ==============================================================================
> --- head/sys/dev/ofw/openfirm.h	Sat Dec 28 02:11:41 2019	(r356141)
> +++ head/sys/dev/ofw/openfirm.h	Sat Dec 28 02:58:30 2019	(r356142)
> @@ -1,7 +1,7 @@
>  /*	$NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $	*/
>  
>  /*-
> - * SPDX-License-Identifier: BSD-4-Clause
> + * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD)
>   *
>   * Copyright (C) 1995, 1996 Wolfgang Solfrank.
>   * Copyright (C) 1995, 1996 TooLs GmbH.
> 
> Modified: head/sys/sys/sched.h
> ==============================================================================
> --- head/sys/sys/sched.h	Sat Dec 28 02:11:41 2019	(r356141)
> +++ head/sys/sys/sched.h	Sat Dec 28 02:58:30 2019	(r356142)
> @@ -1,5 +1,5 @@
>  /*-
> - * SPDX-License-Identifier: BSD-4-Clause
> + * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD)
>   *
>   * Copyright (c) 1996, 1997
>   *      HD Associates, Inc.  All rights reserved.
> 

This situation should not of occured, and leads to an ambigous license state.
What code is under license 2 clause and what under 4 clause? 

It looks to me as if this was done by Jeff Robinson as the 2 clause is
attached to his copyright and we should probably just ask him to relax
that back to the files existing 4 clause license, and or go after Greg
Ansley of HD associtates to get them to relax the 4 clause.

-- 
Rod Grimes                                                 rgrimes at freebsd.org