From owner-dev-commits-src-all@freebsd.org Mon Aug 2 21:54:55 2021 Return-Path: Delivered-To: dev-commits-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 41D0D67B61C; Mon, 2 Aug 2021 21:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GdsHM19gHz3QDy; Mon, 2 Aug 2021 21:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 012F426F68; Mon, 2 Aug 2021 21:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 172Lssrc018908; Mon, 2 Aug 2021 21:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 172LssYo018907; Mon, 2 Aug 2021 21:54:54 GMT (envelope-from git) Date: Mon, 2 Aug 2021 21:54:54 GMT Message-Id: <202108022154.172LssYo018907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d00131e154d9 - main - clock_id: These symbols weren't in 4.4BSD, adjust copyright MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d00131e154d9d847121292fe67cedcd5ac19d60e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 21:54:55 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d00131e154d9d847121292fe67cedcd5ac19d60e commit d00131e154d9d847121292fe67cedcd5ac19d60e Author: Warner Losh AuthorDate: 2021-08-02 21:49:47 +0000 Commit: Warner Losh CommitDate: 2021-08-02 21:50:32 +0000 clock_id: These symbols weren't in 4.4BSD, adjust copyright Peter Wemm added the first CLOCK_* symbols in 0f5ed9f420528 in 1997 after obtaining them from NetBSD. In NetBSD, jtc@netbsd.org committed them in sys/sys/time.h rev 1.19 dated 1996/11/15, along with all the system calls associated with 1003.1b. FreeBSD's values are, however, different than NetBSD's today. The USL/UCB lawsuit was settled in 1994, so these couldn't have been derived from material provided to University of California covered in that settlement. This file does not need the settlement disclaimer. Furthermore, I rewrote most of the code (except the symbols and their values) when merging it from time.h and sys/time.h. Most of the creative content of the file is new, so update copyright to reflect that. Reviewed by: kaktus Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D31369 --- sys/sys/_clock_id.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h index a88eb063122f..47a551428dc3 100644 --- a/sys/sys/_clock_id.h +++ b/sys/sys/_clock_id.h @@ -1,13 +1,7 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. + * Copyright (c) 2021 Netflix, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -17,9 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -32,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)time.h 8.3 (Berkeley) 1/21/94 */ #ifndef _SYS_SYS__CLOCK_ID_H