From owner-svn-src-head@freebsd.org  Mon Nov 27 15:20:25 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 969EFE546F2;
 Mon, 27 Nov 2017 15:20:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 330F5765B0;
 Mon, 27 Nov 2017 15:20:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFKOsq002351;
 Mon, 27 Nov 2017 15:20:24 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFKD0Q002236;
 Mon, 27 Nov 2017 15:20:13 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271520.vARFKD0Q002236@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:20:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326271 - in head/sys: kern libkern libkern/arm
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys: kern libkern libkern/arm
X-SVN-Commit-Revision: 326271
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:20:25 -0000

Author: pfg
Date: Mon Nov 27 15:20:12 2017
New Revision: 326271
URL: https://svnweb.freebsd.org/changeset/base/326271

Log:
  sys/kern: adoption of SPDX licensing ID tags.
  
  Mainly focus on files that use BSD 2-Clause license, however the tool I
  was using misidentified many licenses so this was mostly a manual - error
  prone - task.
  
  The Software Package Data Exchange (SPDX) group provides a specification
  to make it easier for automated tools to detect and summarize well known
  opensource licenses. We are gradually adopting the specification, noting
  that the tags are considered only advisory and do not, in any way,
  superceed or replace the license texts.

Modified:
  head/sys/kern/imgact_aout.c
  head/sys/kern/imgact_elf.c
  head/sys/kern/imgact_elf32.c
  head/sys/kern/imgact_elf64.c
  head/sys/kern/imgact_shell.c
  head/sys/kern/kern_alq.c
  head/sys/kern/kern_clocksource.c
  head/sys/kern/kern_condvar.c
  head/sys/kern/kern_conf.c
  head/sys/kern/kern_context.c
  head/sys/kern/kern_cpu.c
  head/sys/kern/kern_cpuset.c
  head/sys/kern/kern_ctf.c
  head/sys/kern/kern_dtrace.c
  head/sys/kern/kern_environment.c
  head/sys/kern/kern_et.c
  head/sys/kern/kern_event.c
  head/sys/kern/kern_exec.c
  head/sys/kern/kern_fail.c
  head/sys/kern/kern_ffclock.c
  head/sys/kern/kern_hhook.c
  head/sys/kern/kern_idle.c
  head/sys/kern/kern_intr.c
  head/sys/kern/kern_jail.c
  head/sys/kern/kern_khelp.c
  head/sys/kern/kern_kthread.c
  head/sys/kern/kern_ktr.c
  head/sys/kern/kern_linker.c
  head/sys/kern/kern_lock.c
  head/sys/kern/kern_lockstat.c
  head/sys/kern/kern_loginclass.c
  head/sys/kern/kern_mbuf.c
  head/sys/kern/kern_module.c
  head/sys/kern/kern_mtxpool.c
  head/sys/kern/kern_mutex.c
  head/sys/kern/kern_osd.c
  head/sys/kern/kern_physio.c
  head/sys/kern/kern_pmc.c
  head/sys/kern/kern_poll.c
  head/sys/kern/kern_priv.c
  head/sys/kern/kern_racct.c
  head/sys/kern/kern_rangelock.c
  head/sys/kern/kern_rctl.c
  head/sys/kern/kern_rwlock.c
  head/sys/kern/kern_sdt.c
  head/sys/kern/kern_sema.c
  head/sys/kern/kern_sharedpage.c
  head/sys/kern/kern_switch.c
  head/sys/kern/kern_sx.c
  head/sys/kern/kern_syscalls.c
  head/sys/kern/kern_thr.c
  head/sys/kern/kern_thread.c
  head/sys/kern/kern_umtx.c
  head/sys/kern/kern_uuid.c
  head/sys/kern/link_elf.c
  head/sys/kern/link_elf_obj.c
  head/sys/kern/sched_ule.c
  head/sys/kern/subr_acl_nfs4.c
  head/sys/kern/subr_acl_posix1e.c
  head/sys/kern/subr_bufring.c
  head/sys/kern/subr_bus.c
  head/sys/kern/subr_bus_dma.c
  head/sys/kern/subr_busdma_bufalloc.c
  head/sys/kern/subr_capability.c
  head/sys/kern/subr_counter.c
  head/sys/kern/subr_devstat.c
  head/sys/kern/subr_dummy_vdso_tc.c
  head/sys/kern/subr_eventhandler.c
  head/sys/kern/subr_fattime.c
  head/sys/kern/subr_firmware.c
  head/sys/kern/subr_hints.c
  head/sys/kern/subr_kdb.c
  head/sys/kern/subr_kobj.c
  head/sys/kern/subr_lock.c
  head/sys/kern/subr_module.c
  head/sys/kern/subr_msgbuf.c
  head/sys/kern/subr_pctrie.c
  head/sys/kern/subr_power.c
  head/sys/kern/subr_sbuf.c
  head/sys/kern/subr_sleepqueue.c
  head/sys/kern/subr_smp.c
  head/sys/kern/subr_stack.c
  head/sys/kern/subr_taskqueue.c
  head/sys/kern/subr_terminal.c
  head/sys/kern/subr_turnstile.c
  head/sys/kern/subr_unit.c
  head/sys/kern/subr_vmem.c
  head/sys/kern/subr_witness.c
  head/sys/kern/sys_capability.c
  head/sys/kern/sys_pipe.c
  head/sys/kern/sys_procdesc.c
  head/sys/kern/sys_process.c
  head/sys/kern/sysv_ipc.c
  head/sys/kern/sysv_msg.c
  head/sys/kern/sysv_sem.c
  head/sys/kern/sysv_shm.c
  head/sys/kern/tty.c
  head/sys/kern/tty_inq.c
  head/sys/kern/tty_outq.c
  head/sys/kern/tty_pts.c
  head/sys/kern/tty_tty.c
  head/sys/kern/tty_ttydisc.c
  head/sys/kern/uipc_accf.c
  head/sys/kern/uipc_debug.c
  head/sys/kern/uipc_mqueue.c
  head/sys/kern/uipc_sem.c
  head/sys/kern/uipc_shm.c
  head/sys/kern/vfs_acl.c
  head/sys/kern/vfs_aio.c
  head/sys/kern/vfs_bio.c
  head/sys/kern/vfs_extattr.c
  head/sys/kern/vfs_hash.c
  head/sys/libkern/arm/aeabi_unwind.c
  head/sys/libkern/arm/ldivmod_helper.c
  head/sys/libkern/iconv.c
  head/sys/libkern/iconv_ucs.c
  head/sys/libkern/iconv_xlat.c
  head/sys/libkern/iconv_xlat16.c
  head/sys/libkern/inet_aton.c
  head/sys/libkern/memcchr.c
  head/sys/libkern/memmove.c
  head/sys/libkern/memset.c
  head/sys/libkern/strcspn.c
  head/sys/libkern/strdup.c
  head/sys/libkern/strlcat.c
  head/sys/libkern/strlen.c
  head/sys/libkern/strnlen.c
  head/sys/libkern/strspn.c
  head/sys/libkern/strvalid.c

Modified: head/sys/kern/imgact_aout.c
==============================================================================
--- head/sys/kern/imgact_aout.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/imgact_aout.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1993, David Greenman
  * All rights reserved.
  *

Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/imgact_elf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2017 Dell EMC
  * Copyright (c) 2000 David O'Brien
  * Copyright (c) 1995-1996 Søren Schmidt

Modified: head/sys/kern/imgact_elf32.c
==============================================================================
--- head/sys/kern/imgact_elf32.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/imgact_elf32.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/imgact_elf64.c
==============================================================================
--- head/sys/kern/imgact_elf64.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/imgact_elf64.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/imgact_shell.c
==============================================================================
--- head/sys/kern/imgact_shell.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/imgact_shell.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1993, David Greenman
  * All rights reserved.
  *

Modified: head/sys/kern/kern_alq.c
==============================================================================
--- head/sys/kern/kern_alq.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_alq.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
  * Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
  * Copyright (c) 2009-2010, The FreeBSD Foundation

Modified: head/sys/kern/kern_clocksource.c
==============================================================================
--- head/sys/kern/kern_clocksource.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_clocksource.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_condvar.c
==============================================================================
--- head/sys/kern/kern_condvar.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_condvar.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
  * All rights reserved.
  *

Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_conf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2002 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/kern/kern_context.c
==============================================================================
--- head/sys/kern/kern_context.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_context.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Daniel M. Eischen <deischen@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_cpu.c
==============================================================================
--- head/sys/kern/kern_cpu.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_cpu.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004-2007 Nate Lawson (SDG)
  * All rights reserved.
  *

Modified: head/sys/kern/kern_cpuset.c
==============================================================================
--- head/sys/kern/kern_cpuset.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_cpuset.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008,  Jeffrey Roberson <jeff@freebsd.org>
  * All rights reserved.
  * 

Modified: head/sys/kern/kern_ctf.c
==============================================================================
--- head/sys/kern/kern_ctf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_ctf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 John Birrell <jb@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_dtrace.c
==============================================================================
--- head/sys/kern/kern_dtrace.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_dtrace.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007-2008 John Birrell <jb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_environment.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998 Michael Smith
  * All rights reserved.
  *

Modified: head/sys/kern/kern_et.c
==============================================================================
--- head/sys/kern/kern_et.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_et.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_event.c
==============================================================================
--- head/sys/kern/kern_event.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_event.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
  * Copyright 2004 John-Mark Gurney <jmg@FreeBSD.org>
  * Copyright (c) 2009 Apple, Inc.

Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_exec.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1993, David Greenman
  * All rights reserved.
  *

Modified: head/sys/kern/kern_fail.c
==============================================================================
--- head/sys/kern/kern_fail.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_fail.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Isilon Inc http://www.isilon.com/
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_ffclock.c
==============================================================================
--- head/sys/kern/kern_ffclock.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_ffclock.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2011 The University of Melbourne
  * All rights reserved.
  *

Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_hhook.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/kern/kern_idle.c
==============================================================================
--- head/sys/kern/kern_idle.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_idle.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2000-2004 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_intr.c
==============================================================================
--- head/sys/kern/kern_intr.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_intr.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_jail.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Poul-Henning Kamp.
  * Copyright (c) 2008 Bjoern A. Zeeb.
  * Copyright (c) 2009 James Gritton.

Modified: head/sys/kern/kern_khelp.c
==============================================================================
--- head/sys/kern/kern_khelp.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_khelp.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/kern/kern_kthread.c
==============================================================================
--- head/sys/kern/kern_kthread.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_kthread.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_ktr.c
==============================================================================
--- head/sys/kern/kern_ktr.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_ktr.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_linker.c
==============================================================================
--- head/sys/kern/kern_linker.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_linker.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997-2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_lock.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_lockstat.c
==============================================================================
--- head/sys/kern/kern_lockstat.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_lockstat.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2008-2009 Stacey Son <sson@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_loginclass.c
==============================================================================
--- head/sys/kern/kern_loginclass.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_loginclass.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2011 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_mbuf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004, 2005,
  *	Bosko Milekic <bmilekic@FreeBSD.org>.  All rights reserved.
  *

Modified: head/sys/kern/kern_module.c
==============================================================================
--- head/sys/kern/kern_module.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_module.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/kern_mtxpool.c
==============================================================================
--- head/sys/kern/kern_mtxpool.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_mtxpool.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Matthew Dillon.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_mutex.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_osd.c
==============================================================================
--- head/sys/kern/kern_osd.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_osd.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_physio.c
==============================================================================
--- head/sys/kern/kern_physio.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_physio.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 John S. Dyson
  * All rights reserved.
  *

Modified: head/sys/kern/kern_pmc.c
==============================================================================
--- head/sys/kern/kern_pmc.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_pmc.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2008 Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/kern/kern_poll.c
==============================================================================
--- head/sys/kern/kern_poll.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_poll.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001-2002 Luigi Rizzo
  *
  * Supported by: the Xorp Project (www.xorp.org)

Modified: head/sys/kern/kern_priv.c
==============================================================================
--- head/sys/kern/kern_priv.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_priv.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 nCircle Network Security, Inc.
  * Copyright (c) 2009 Robert N. M. Watson
  * All rights reserved.

Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_racct.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/kern/kern_rangelock.c
==============================================================================
--- head/sys/kern/kern_rangelock.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_rangelock.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_rctl.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/kern/kern_rwlock.c
==============================================================================
--- head/sys/kern/kern_rwlock.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_rwlock.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_sdt.c
==============================================================================
--- head/sys/kern/kern_sdt.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_sdt.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_sema.c
==============================================================================
--- head/sys/kern/kern_sema.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_sema.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2001 Jason Evans <jasone@freebsd.org>.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/kern_sharedpage.c
==============================================================================
--- head/sys/kern/kern_sharedpage.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_sharedpage.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010, 2012 Konstantin Belousov <kib@FreeBSD.org>
  * Copyright (c) 2015 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/kern/kern_switch.c
==============================================================================
--- head/sys/kern/kern_switch.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_switch.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_sx.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
  * Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
  * All rights reserved.

Modified: head/sys/kern/kern_syscalls.c
==============================================================================
--- head/sys/kern/kern_syscalls.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_syscalls.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Assar Westerlund
  * All rights reserved.
  *

Modified: head/sys/kern/kern_thr.c
==============================================================================
--- head/sys/kern/kern_thr.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_thr.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003, Jeffrey Roberson <jeff@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/kern_thread.c
==============================================================================
--- head/sys/kern/kern_thread.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_thread.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 2001 Julian Elischer <julian@freebsd.org>.
  *  All rights reserved.
  *

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_umtx.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2015, 2016 The FreeBSD Foundation
  * Copyright (c) 2004, David Xu <davidxu@freebsd.org>
  * Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>

Modified: head/sys/kern/kern_uuid.c
==============================================================================
--- head/sys/kern/kern_uuid.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/kern_uuid.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/kern/link_elf.c
==============================================================================
--- head/sys/kern/link_elf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/link_elf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998-2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/link_elf_obj.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998-2000 Doug Rabson
  * Copyright (c) 2004 Peter Wemm
  * All rights reserved.

Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sched_ule.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002-2007, Jeffrey Roberson <jeff@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_acl_nfs4.c
==============================================================================
--- head/sys/kern/subr_acl_nfs4.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_acl_nfs4.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008-2010 Edward Tomasz Napierała <trasz@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_acl_posix1e.c
==============================================================================
--- head/sys/kern/subr_acl_posix1e.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_acl_posix1e.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2006 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/kern/subr_bufring.c
==============================================================================
--- head/sys/kern/subr_bufring.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_bufring.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007, 2008 Kip Macy <kmacy@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_bus.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997,1998,2003 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/subr_bus_dma.c
==============================================================================
--- head/sys/kern/subr_bus_dma.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_bus_dma.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 EMC Corp.
  * All rights reserved.
  *

Modified: head/sys/kern/subr_busdma_bufalloc.c
==============================================================================
--- head/sys/kern/subr_busdma_bufalloc.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_busdma_bufalloc.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 Ian Lepore
  * All rights reserved.
  *

Modified: head/sys/kern/subr_capability.c
==============================================================================
--- head/sys/kern/subr_capability.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_capability.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/kern/subr_counter.c
==============================================================================
--- head/sys/kern/subr_counter.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_counter.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_devstat.c
==============================================================================
--- head/sys/kern/subr_devstat.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_devstat.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * All rights reserved.
  *

Modified: head/sys/kern/subr_dummy_vdso_tc.c
==============================================================================
--- head/sys/kern/subr_dummy_vdso_tc.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_dummy_vdso_tc.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
  * All rights reserved.
  *

Modified: head/sys/kern/subr_eventhandler.c
==============================================================================
--- head/sys/kern/subr_eventhandler.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_eventhandler.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_fattime.c
==============================================================================
--- head/sys/kern/subr_fattime.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_fattime.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/kern/subr_firmware.c
==============================================================================
--- head/sys/kern/subr_firmware.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_firmware.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005-2008, Sam Leffler <sam@errno.com>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_hints.c
==============================================================================
--- head/sys/kern/subr_hints.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_hints.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000,2001 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_kdb.c
==============================================================================
--- head/sys/kern/subr_kdb.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_kdb.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 The FreeBSD Project
  * All rights reserved.
  *

Modified: head/sys/kern/subr_kobj.c
==============================================================================
--- head/sys/kern/subr_kobj.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_kobj.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000,2003 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/subr_lock.c
==============================================================================
--- head/sys/kern/subr_lock.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_lock.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_module.c
==============================================================================
--- head/sys/kern/subr_module.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_module.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998 Michael Smith
  * All rights reserved.
  *

Modified: head/sys/kern/subr_msgbuf.c
==============================================================================
--- head/sys/kern/subr_msgbuf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_msgbuf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Ian Dowse.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/subr_pctrie.c
==============================================================================
--- head/sys/kern/subr_pctrie.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_pctrie.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 EMC Corp.
  * Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
  * Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>

Modified: head/sys/kern/subr_power.c
==============================================================================
--- head/sys/kern/subr_power.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_power.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Mitsuru IWASAKI
  * All rights reserved.
  *

Modified: head/sys/kern/subr_sbuf.c
==============================================================================
--- head/sys/kern/subr_sbuf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_sbuf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000-2008 Poul-Henning Kamp
  * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
  * All rights reserved.

Modified: head/sys/kern/subr_sleepqueue.c
==============================================================================
--- head/sys/kern/subr_sleepqueue.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_sleepqueue.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/subr_smp.c
==============================================================================
--- head/sys/kern/subr_smp.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_smp.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001, John Baldwin <jhb@FreeBSD.org>.
  * All rights reserved.
  *

Modified: head/sys/kern/subr_stack.c
==============================================================================
--- head/sys/kern/subr_stack.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_stack.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Antoine Brodin
  * All rights reserved.
  *

Modified: head/sys/kern/subr_taskqueue.c
==============================================================================
--- head/sys/kern/subr_taskqueue.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_taskqueue.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/kern/subr_terminal.c
==============================================================================
--- head/sys/kern/subr_terminal.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_terminal.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/kern/subr_turnstile.c
==============================================================================
--- head/sys/kern/subr_turnstile.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_turnstile.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/subr_unit.c
==============================================================================
--- head/sys/kern/subr_unit.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_unit.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/kern/subr_vmem.c
==============================================================================
--- head/sys/kern/subr_vmem.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_vmem.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
  * Copyright (c) 2013 EMC Corp.
  * All rights reserved.

Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/subr_witness.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2008 Isilon Systems, Inc.
  * Copyright (c) 2008 Ilya Maykov <ivmaykov@gmail.com>
  * Copyright (c) 1998 Berkeley Software Design, Inc.

Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sys_capability.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008-2011 Robert N. M. Watson
  * Copyright (c) 2010-2011 Jonathan Anderson
  * Copyright (c) 2012 FreeBSD Foundation

Modified: head/sys/kern/sys_pipe.c
==============================================================================
--- head/sys/kern/sys_pipe.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sys_pipe.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996 John S. Dyson
  * Copyright (c) 2012 Giovanni Trematerra
  * All rights reserved.

Modified: head/sys/kern/sys_procdesc.c
==============================================================================
--- head/sys/kern/sys_procdesc.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sys_procdesc.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009, 2016 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/kern/sys_process.c
==============================================================================
--- head/sys/kern/sys_process.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sys_process.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994, Sean Eric Fagan
  * All rights reserved.
  *

Modified: head/sys/kern/sysv_ipc.c
==============================================================================
--- head/sys/kern/sysv_ipc.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sysv_ipc.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,5 +1,7 @@
 /*	$NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $	*/
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
  * Copyright (c) 2006 nCircle Network Security, Inc.
  * All rights reserved.

Modified: head/sys/kern/sysv_msg.c
==============================================================================
--- head/sys/kern/sysv_msg.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sysv_msg.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -17,6 +17,8 @@
  * This software is provided ``AS IS'' without any warranties of any kind.
  */
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2005 McAfee, Inc.
  * Copyright (c) 2016-2017 Robert N. M. Watson
  * All rights reserved.

Modified: head/sys/kern/sysv_sem.c
==============================================================================
--- head/sys/kern/sysv_sem.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sysv_sem.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -6,6 +6,8 @@
  * This software is provided ``AS IS'' without any warranties of any kind.
  */
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2005 McAfee, Inc.
  * Copyright (c) 2016-2017 Robert N. M. Watson
  * All rights reserved.

Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/sysv_shm.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,5 +1,7 @@
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1994 Adam Glass and Charles Hannum.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/tty.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/tty_inq.c
==============================================================================
--- head/sys/kern/tty_inq.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/tty_inq.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/tty_outq.c
==============================================================================
--- head/sys/kern/tty_outq.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/tty_outq.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/tty_pts.c
==============================================================================
--- head/sys/kern/tty_pts.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/tty_pts.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/tty_tty.c
==============================================================================
--- head/sys/kern/tty_tty.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/tty_tty.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Poul-Henning Kamp.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/tty_ttydisc.c
==============================================================================
--- head/sys/kern/tty_ttydisc.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/tty_ttydisc.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/kern/uipc_accf.c
==============================================================================
--- head/sys/kern/uipc_accf.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/uipc_accf.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Paycounter, Inc.
  * Copyright (c) 2005 Robert N. M. Watson
  * Author: Alfred Perlstein <alfred@paycounter.com>, <alfred@FreeBSD.org>

Modified: head/sys/kern/uipc_debug.c
==============================================================================
--- head/sys/kern/uipc_debug.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/uipc_debug.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/kern/uipc_mqueue.c
==============================================================================
--- head/sys/kern/uipc_mqueue.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/uipc_mqueue.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
  * Copyright (c) 2016-2017 Robert N. M. Watson
  * All rights reserved.

Modified: head/sys/kern/uipc_sem.c
==============================================================================
--- head/sys/kern/uipc_sem.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/uipc_sem.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
  * Copyright (c) 2003-2005 SPARTA, Inc.
  * Copyright (c) 2005, 2016-2017 Robert N. M. Watson

Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/uipc_shm.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006, 2011, 2016-2017 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/kern/vfs_acl.c
==============================================================================
--- head/sys/kern/vfs_acl.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/vfs_acl.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2006, 2016-2017 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/kern/vfs_aio.c
==============================================================================
--- head/sys/kern/vfs_aio.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/vfs_aio.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 John S. Dyson.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/vfs_bio.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Poul-Henning Kamp
  * Copyright (c) 1994,1997 John S. Dyson
  * Copyright (c) 2013 The FreeBSD Foundation

Modified: head/sys/kern/vfs_extattr.c
==============================================================================
--- head/sys/kern/vfs_extattr.c	Mon Nov 27 15:17:37 2017	(r326270)
+++ head/sys/kern/vfs_extattr.c	Mon Nov 27 15:20:12 2017	(r326271)
@@ -1,4 +1,6 @@

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***