From owner-svn-src-all@freebsd.org Sat Dec 28 03:16:17 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 328D11D8668; Sat, 28 Dec 2019 03:16:17 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47l83h6kN9z4sm0; Sat, 28 Dec 2019 03:16:16 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id xBS3GF6i041169; Fri, 27 Dec 2019 19:16:15 -0800 (PST) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id xBS3GFEt041168; Fri, 27 Dec 2019 19:16:15 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201912280316.xBS3GFEt041168@gndrsh.dnsmgr.net> Subject: Re: svn commit: r356142 - in head/sys: dev/ofw sys In-Reply-To: <201912280258.xBS2wU2R068141@repo.freebsd.org> To: "Pedro F. Giffuni" Date: Fri, 27 Dec 2019 19:16:15 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 47l83h6kN9z4sm0 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.98 / 15.00]; NEURAL_HAM_MEDIUM(-0.98)[-0.985,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2019 03:16:17 -0000 > 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@freebsd.org