git: 446867bf801a - stable/11 - copyrights: Happy New Year 2021

[Glen Barber]

The branch stable/11 has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=446867bf801ae39b9a42df2ba6c9444a0c236d42

commit 446867bf801ae39b9a42df2ba6c9444a0c236d42
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2020-12-31 15:23:36 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2020-12-31 15:40:15 +0000

    copyrights: Happy New Year 2021
    
    Good riddance 2020.
    
    Sponsored by:   Rubicon Communications, LLC (netgate.com)
    
    (cherry picked from commit c3e89a30fdc2c985b73f46ab2f414d53945fc00b)
---
 COPYRIGHT           |  3 +--
 sys/sys/copyright.h | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 4a40a9f3c6cf..3cf4fa961551 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,10 +1,9 @@
-# $FreeBSD$
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2020 The FreeBSD Project.
+Copyright (c) 1992-2021 The FreeBSD Project.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 8c33d74c700b..8df68cbc4aec 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -1,5 +1,11 @@
 /*-
+<<<<<<< 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
@@ -21,8 +27,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.
- *
- * $FreeBSD$
  */
 
 
@@ -34,7 +38,7 @@
 
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-	"Copyright (c) 1992-2020 The FreeBSD Project.\n"
+	"Copyright (c) 1992-2021 The FreeBSD Project.\n"
 
 /* Foundation */
 #define	TRADEMARK_Foundation \