From owner-dev-commits-src-branches@freebsd.org Thu Dec 31 15:45:33 2020 Return-Path: Delivered-To: dev-commits-src-branches@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 6C8C44C593F; Thu, 31 Dec 2020 15:45:33 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6CCw65Ffz3C58; Thu, 31 Dec 2020 15:45:32 +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 AB05D13018; Thu, 31 Dec 2020 15:45:32 +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 0BVFjWeL080516; Thu, 31 Dec 2020 15:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BVFjWV2080515; Thu, 31 Dec 2020 15:45:32 GMT (envelope-from git) Date: Thu, 31 Dec 2020 15:45:32 GMT Message-Id: <202012311545.0BVFjWV2080515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 057a5704a32a - stable/11 - copyrights: Happy New Year 2021 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: 057a5704a32a3495c35ae8d80b64d4ecd2ee6ac0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the stable branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2020 15:45:33 -0000 The branch stable/11 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=057a5704a32a3495c35ae8d80b64d4ecd2ee6ac0 commit 057a5704a32a3495c35ae8d80b64d4ecd2ee6ac0 Author: Glen Barber AuthorDate: 2020-12-31 15:44:24 +0000 Commit: Glen Barber CommitDate: 2020-12-31 15:44:24 +0000 copyrights: Happy New Year 2021 Good riddance 2020. (This fixes the previous MFC) Sponsored by: Rubicon Communications, LLC (netgate.com) --- COPYRIGHT | 1 + sys/sys/copyright.h | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 3cf4fa961551..18faf948fbba 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,3 +1,4 @@ +# $FreeBSD$ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h index 8df68cbc4aec..dfcd2dc013cc 100644 --- a/sys/sys/copyright.h +++ b/sys/sys/copyright.h @@ -1,11 +1,7 @@ /*- -<<<<<<< HEAD - * Copyright (C) 1992-2020 The FreeBSD Project. All rights reserved. -======= * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (C) 1992-2021 The FreeBSD Project. All rights reserved. ->>>>>>> c3e89a30fdc... copyrights: Happy New Year 2021 * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,6 +23,8 @@ * 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. + * + * $FreeBSD$ */