From owner-svn-src-head@freebsd.org  Mon Nov 27 15:02:12 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 34F3CE5393D;
 Mon, 27 Nov 2017 15:02:12 +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 C323B749FB;
 Mon, 27 Nov 2017 15:02:11 +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 vARF2A1w095025;
 Mon, 27 Nov 2017 15:02:10 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF1xNs094908;
 Mon, 27 Nov 2017 15:01:59 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271501.vARF1xNs094908@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:01:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326256 - head/sys/sys
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/sys/sys
X-SVN-Commit-Revision: 326256
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:02:12 -0000

Author: pfg
Date: Mon Nov 27 15:01:59 2017
New Revision: 326256
URL: https://svnweb.freebsd.org/changeset/base/326256

Log:
  sys/sys: further 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/sys/_bitset.h
  head/sys/sys/_bus_dma.h
  head/sys/sys/_cpuset.h
  head/sys/sys/_ffcounter.h
  head/sys/sys/_lock.h
  head/sys/sys/_lockmgr.h
  head/sys/sys/_mutex.h
  head/sys/sys/_null.h
  head/sys/sys/_pctrie.h
  head/sys/sys/_pthreadtypes.h
  head/sys/sys/_rwlock.h
  head/sys/sys/_semaphore.h
  head/sys/sys/_stack.h
  head/sys/sys/_stdint.h
  head/sys/sys/_sx.h
  head/sys/sys/_task.h
  head/sys/sys/_timeval.h
  head/sys/sys/_types.h
  head/sys/sys/_umtx.h
  head/sys/sys/_unrhdr.h
  head/sys/sys/aac_ioctl.h
  head/sys/sys/acl.h
  head/sys/sys/agpio.h
  head/sys/sys/aio.h
  head/sys/sys/alq.h
  head/sys/sys/assym.h
  head/sys/sys/ata.h
  head/sys/sys/bitset.h
  head/sys/sys/boot.h
  head/sys/sys/buf_ring.h
  head/sys/sys/bufobj.h
  head/sys/sys/bus.h
  head/sys/sys/bus_dma.h
  head/sys/sys/busdma_bufalloc.h
  head/sys/sys/capability.h
  head/sys/sys/caprights.h
  head/sys/sys/cdrio.h
  head/sys/sys/chio.h
  head/sys/sys/clock.h
  head/sys/sys/condvar.h
  head/sys/sys/consio.h
  head/sys/sys/copyright.h
  head/sys/sys/counter.h
  head/sys/sys/cpu.h
  head/sys/sys/cpuctl.h
  head/sys/sys/cpuset.h
  head/sys/sys/devicestat.h
  head/sys/sys/digiio.h
  head/sys/sys/dtrace_bsd.h
  head/sys/sys/dvdio.h
  head/sys/sys/elf.h
  head/sys/sys/elf32.h
  head/sys/sys/elf64.h
  head/sys/sys/elf_common.h
  head/sys/sys/elf_generic.h
  head/sys/sys/endian.h
  head/sys/sys/eui64.h
  head/sys/sys/event.h
  head/sys/sys/eventhandler.h
  head/sys/sys/eventvar.h
  head/sys/sys/extattr.h
  head/sys/sys/fail.h
  head/sys/sys/fdcio.h
  head/sys/sys/firmware.h
  head/sys/sys/gpio.h
  head/sys/sys/gpt.h
  head/sys/sys/hash.h
  head/sys/sys/hhook.h
  head/sys/sys/iconv.h
  head/sys/sys/imgact_elf.h
  head/sys/sys/interrupt.h
  head/sys/sys/ipmi.h
  head/sys/sys/jail.h
  head/sys/sys/joystick.h
  head/sys/sys/kdb.h
  head/sys/sys/kenv.h
  head/sys/sys/kerneldump.h
  head/sys/sys/khelp.h
  head/sys/sys/kobj.h
  head/sys/sys/ksem.h
  head/sys/sys/kthread.h
  head/sys/sys/ktr.h
  head/sys/sys/ktr_class.h
  head/sys/sys/link_aout.h
  head/sys/sys/link_elf.h
  head/sys/sys/linker.h
  head/sys/sys/linker_set.h
  head/sys/sys/lock.h
  head/sys/sys/lock_profile.h
  head/sys/sys/lockmgr.h
  head/sys/sys/lockstat.h
  head/sys/sys/loginclass.h
  head/sys/sys/mac.h
  head/sys/sys/mchain.h
  head/sys/sys/memdesc.h
  head/sys/sys/module.h
  head/sys/sys/module_khelp.h
  head/sys/sys/mqueue.h
  head/sys/sys/msg.h
  head/sys/sys/mutex.h
  head/sys/sys/osd.h
  head/sys/sys/pciio.h
  head/sys/sys/pctrie.h
  head/sys/sys/pmc.h
  head/sys/sys/pmckern.h
  head/sys/sys/pmclog.h
  head/sys/sys/poll.h
  head/sys/sys/power.h
  head/sys/sys/priority.h
  head/sys/sys/priv.h
  head/sys/sys/procctl.h
  head/sys/sys/procdesc.h
  head/sys/sys/procfs.h
  head/sys/sys/ptio.h
  head/sys/sys/racct.h
  head/sys/sys/random.h
  head/sys/sys/rangelock.h
  head/sys/sys/rctl.h
  head/sys/sys/refcount.h
  head/sys/sys/regression.h
  head/sys/sys/rtprio.h
  head/sys/sys/runq.h
  head/sys/sys/rwlock.h
  head/sys/sys/sbuf.h
  head/sys/sys/sdt.h
  head/sys/sys/sema.h
  head/sys/sys/serial.h
  head/sys/sys/sf_buf.h
  head/sys/sys/shm.h
  head/sys/sys/sleepqueue.h
  head/sys/sys/slicer.h
  head/sys/sys/snoop.h
  head/sys/sys/stack.h
  head/sys/sys/stdatomic.h
  head/sys/sys/stddef.h
  head/sys/sys/stdint.h
  head/sys/sys/sx.h
  head/sys/sys/syscallsubr.h
  head/sys/sys/taskqueue.h
  head/sys/sys/terminal.h
  head/sys/sys/thr.h
  head/sys/sys/timeet.h
  head/sys/sys/timeffc.h
  head/sys/sys/timers.h
  head/sys/sys/tree.h
  head/sys/sys/tty.h
  head/sys/sys/ttydevsw.h
  head/sys/sys/ttydisc.h
  head/sys/sys/ttyhook.h
  head/sys/sys/ttyqueue.h
  head/sys/sys/turnstile.h
  head/sys/sys/ucontext.h
  head/sys/sys/umtx.h
  head/sys/sys/uuid.h
  head/sys/sys/vdso.h
  head/sys/sys/vmem.h
  head/sys/sys/watchdog.h

Modified: head/sys/sys/_bitset.h
==============================================================================
--- head/sys/sys/_bitset.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_bitset.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/_bus_dma.h
==============================================================================
--- head/sys/sys/_bus_dma.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_bus_dma.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2006 John-Mark Gurney.
  * All rights reserved.
  *

Modified: head/sys/sys/_cpuset.h
==============================================================================
--- head/sys/sys/_cpuset.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_cpuset.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/_ffcounter.h
==============================================================================
--- head/sys/sys/_ffcounter.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_ffcounter.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2011 The University of Melbourne
  * All rights reserved.
  *

Modified: head/sys/sys/_lock.h
==============================================================================
--- head/sys/sys/_lock.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_lock.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/_lockmgr.h
==============================================================================
--- head/sys/sys/_lockmgr.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_lockmgr.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/_mutex.h
==============================================================================
--- head/sys/sys/_mutex.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_mutex.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/_null.h
==============================================================================
--- head/sys/sys/_null.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_null.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/sys/_pctrie.h
==============================================================================
--- head/sys/sys/_pctrie.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_pctrie.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/_pthreadtypes.h
==============================================================================
--- head/sys/sys/_pthreadtypes.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_pthreadtypes.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
  * Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
  * All rights reserved.

Modified: head/sys/sys/_rwlock.h
==============================================================================
--- head/sys/sys/_rwlock.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_rwlock.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/_semaphore.h
==============================================================================
--- head/sys/sys/_semaphore.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_semaphore.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/_stack.h
==============================================================================
--- head/sys/sys/_stack.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_stack.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Antoine Brodin
  * All rights reserved.
  *

Modified: head/sys/sys/_stdint.h
==============================================================================
--- head/sys/sys/_stdint.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_stdint.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2011 David E. O'Brien <obrien@FreeBSD.org>
  * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/sys/_sx.h
==============================================================================
--- head/sys/sys/_sx.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_sx.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/sys/_task.h
==============================================================================
--- head/sys/sys/_task.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_task.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/_timeval.h
==============================================================================
--- head/sys/sys/_timeval.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_timeval.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/_types.h
==============================================================================
--- head/sys/sys/_types.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_types.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/_umtx.h
==============================================================================
--- head/sys/sys/_umtx.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_umtx.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010, David Xu <davidxu@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/sys/_unrhdr.h
==============================================================================
--- head/sys/sys/_unrhdr.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/_unrhdr.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/sys/aac_ioctl.h
==============================================================================
--- head/sys/sys/aac_ioctl.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/aac_ioctl.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Michael Smith
  * Copyright (c) 2000 Scott Long
  * Copyright (c) 2000 BSDi

Modified: head/sys/sys/acl.h
==============================================================================
--- head/sys/sys/acl.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/acl.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2001 Robert N. M. Watson
  * Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/sys/agpio.h
==============================================================================
--- head/sys/sys/agpio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/agpio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/aio.h
==============================================================================
--- head/sys/sys/aio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/aio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/alq.h
==============================================================================
--- head/sys/sys/alq.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/alq.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
  * Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
  * Copyright (c) 2010, The FreeBSD Foundation

Modified: head/sys/sys/assym.h
==============================================================================
--- head/sys/sys/assym.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/assym.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/sys/ata.h
==============================================================================
--- head/sys/sys/ata.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/ata.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/bitset.h
==============================================================================
--- head/sys/sys/bitset.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/bitset.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/boot.h
==============================================================================
--- head/sys/sys/boot.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/boot.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
  * All rights reserved.
  *

Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/buf_ring.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007-2009 Kip Macy <kmacy@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/sys/bufobj.h
==============================================================================
--- head/sys/sys/bufobj.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/bufobj.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Poul-Henning Kamp
  * All rights reserved.
  *

Modified: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/bus.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997,1998,2003 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/bus_dma.h
==============================================================================
--- head/sys/sys/bus_dma.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/bus_dma.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,6 +1,8 @@
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

Modified: head/sys/sys/busdma_bufalloc.h
==============================================================================
--- head/sys/sys/busdma_bufalloc.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/busdma_bufalloc.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 Ian Lepore
  * All rights reserved.
  *

Modified: head/sys/sys/capability.h
==============================================================================
--- head/sys/sys/capability.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/capability.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/sys/caprights.h
==============================================================================
--- head/sys/sys/caprights.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/caprights.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/sys/cdrio.h
==============================================================================
--- head/sys/sys/cdrio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/cdrio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/chio.h
==============================================================================
--- head/sys/sys/chio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/chio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
  * All rights reserved.
  *

Modified: head/sys/sys/clock.h
==============================================================================
--- head/sys/sys/clock.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/clock.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
  *

Modified: head/sys/sys/condvar.h
==============================================================================
--- head/sys/sys/condvar.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/condvar.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/consio.h
==============================================================================
--- head/sys/sys/consio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/consio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991-1996 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/sys/copyright.h
==============================================================================
--- head/sys/sys/copyright.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/copyright.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 1992-2017 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/counter.h
==============================================================================
--- head/sys/sys/counter.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/counter.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/cpu.h
==============================================================================
--- head/sys/sys/cpu.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/cpu.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005-2007 Nate Lawson (SDG)
  * All rights reserved.
  *

Modified: head/sys/sys/cpuctl.h
==============================================================================
--- head/sys/sys/cpuctl.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/cpuctl.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006-2008 Stanislav Sedov <stas@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/cpuset.h
==============================================================================
--- head/sys/sys/cpuset.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/cpuset.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/devicestat.h
==============================================================================
--- head/sys/sys/devicestat.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/devicestat.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * All rights reserved.
  *

Modified: head/sys/sys/digiio.h
==============================================================================
--- head/sys/sys/digiio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/digiio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
  *   based on work by Slawa Olhovchenkov
  *                    John Prince <johnp@knight-trosoft.com>

Modified: head/sys/sys/dtrace_bsd.h
==============================================================================
--- head/sys/sys/dtrace_bsd.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/dtrace_bsd.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/dvdio.h
==============================================================================
--- head/sys/sys/dvdio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/dvdio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1999,2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/elf.h
==============================================================================
--- head/sys/sys/elf.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/elf.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 David E. O'Brien.
  * All rights reserved.
  *

Modified: head/sys/sys/elf32.h
==============================================================================
--- head/sys/sys/elf32.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/elf32.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/sys/sys/elf64.h
==============================================================================
--- head/sys/sys/elf64.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/elf64.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1996-1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/sys/sys/elf_common.h
==============================================================================
--- head/sys/sys/elf_common.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/elf_common.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Dell EMC
  * Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
  * Copyright (c) 1998 John D. Polstra.

Modified: head/sys/sys/elf_generic.h
==============================================================================
--- head/sys/sys/elf_generic.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/elf_generic.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998 John D. Polstra.
  * All rights reserved.
  *

Modified: head/sys/sys/endian.h
==============================================================================
--- head/sys/sys/endian.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/endian.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/eui64.h
==============================================================================
--- head/sys/sys/eui64.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/eui64.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright 2004 The Aerospace Corporation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/event.h
==============================================================================
--- head/sys/sys/event.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/event.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/eventhandler.h
==============================================================================
--- head/sys/sys/eventhandler.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/eventhandler.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/eventvar.h
==============================================================================
--- head/sys/sys/eventvar.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/eventvar.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999,2000 Jonathan Lemon <jlemon@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/extattr.h
==============================================================================
--- head/sys/sys/extattr.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/extattr.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2001 Robert N. M. Watson
  * All rights reserved.
  *

Modified: head/sys/sys/fail.h
==============================================================================
--- head/sys/sys/fail.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/fail.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/fdcio.h
==============================================================================
--- head/sys/sys/fdcio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/fdcio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
  * All rights reserved.
  *

Modified: head/sys/sys/firmware.h
==============================================================================
--- head/sys/sys/firmware.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/firmware.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005, Sam Leffler <sam@errno.com>
  * All rights reserved.
  *

Modified: head/sys/sys/gpio.h
==============================================================================
--- head/sys/sys/gpio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/gpio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,6 +1,8 @@
 /* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
 /*	$OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $	*/
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
+ *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/gpt.h
==============================================================================
--- head/sys/sys/gpt.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/gpt.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/sys/hash.h
==============================================================================
--- head/sys/sys/hash.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/hash.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Tobias Weingartner
  * All rights reserved.
  *

Modified: head/sys/sys/hhook.h
==============================================================================
--- head/sys/sys/hhook.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/hhook.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/iconv.h
==============================================================================
--- head/sys/sys/iconv.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/iconv.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000-2001 Boris Popov
  * All rights reserved.
  *

Modified: head/sys/sys/imgact_elf.h
==============================================================================
--- head/sys/sys/imgact_elf.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/imgact_elf.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1995-1996 Søren Schmidt
  * All rights reserved.
  *

Modified: head/sys/sys/interrupt.h
==============================================================================
--- head/sys/sys/interrupt.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/interrupt.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/ipmi.h
==============================================================================
--- head/sys/sys/ipmi.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/ipmi.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
  * All rights reserved.
  *

Modified: head/sys/sys/jail.h
==============================================================================
--- head/sys/sys/jail.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/jail.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Poul-Henning Kamp.
  * Copyright (c) 2009 James Gritton.
  * All rights reserved.

Modified: head/sys/sys/joystick.h
==============================================================================
--- head/sys/sys/joystick.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/joystick.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1995 Jean-Marc Zucconi
  * All rights reserved.
  *

Modified: head/sys/sys/kdb.h
==============================================================================
--- head/sys/sys/kdb.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/kdb.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *

Modified: head/sys/sys/kenv.h
==============================================================================
--- head/sys/sys/kenv.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/kenv.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/kerneldump.h
==============================================================================
--- head/sys/sys/kerneldump.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/kerneldump.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2002 Poul-Henning Kamp
  * Copyright (c) 2002 Networks Associates Technology, Inc.
  * All rights reserved.

Modified: head/sys/sys/khelp.h
==============================================================================
--- head/sys/sys/khelp.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/khelp.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/sys/kobj.h
==============================================================================
--- head/sys/sys/kobj.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/kobj.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000,2003 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/ksem.h
==============================================================================
--- head/sys/sys/ksem.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/ksem.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/sys/kthread.h
==============================================================================
--- head/sys/sys/kthread.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/kthread.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/ktr.h
==============================================================================
--- head/sys/sys/ktr.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/ktr.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/ktr_class.h
==============================================================================
--- head/sys/sys/ktr_class.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/ktr_class.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/link_aout.h
==============================================================================
--- head/sys/sys/link_aout.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/link_aout.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1993 Paul Kranenburg
  * All rights reserved.
  *

Modified: head/sys/sys/link_elf.h
==============================================================================
--- head/sys/sys/link_elf.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/link_elf.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1993 Paul Kranenburg
  * All rights reserved.
  *

Modified: head/sys/sys/linker.h
==============================================================================
--- head/sys/sys/linker.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/linker.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997-2000 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/linker_set.h
==============================================================================
--- head/sys/sys/linker_set.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/linker_set.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 John D. Polstra
  * Copyright (c) 1999,2001 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/sys/lock.h
==============================================================================
--- head/sys/sys/lock.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/lock.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/lock_profile.h
==============================================================================
--- head/sys/sys/lock_profile.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/lock_profile.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 Kip Macy kmacy@FreeBSD.org
  * Copyright (c) 2006 Kris Kennaway kris@FreeBSD.org
  * Copyright (c) 2006 Dag-Erling Smorgrav des@des.no

Modified: head/sys/sys/lockmgr.h
==============================================================================
--- head/sys/sys/lockmgr.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/lockmgr.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/lockstat.h
==============================================================================
--- head/sys/sys/lockstat.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/lockstat.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org> 
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/loginclass.h
==============================================================================
--- head/sys/sys/loginclass.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/loginclass.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2011 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/sys/mac.h
==============================================================================
--- head/sys/sys/mac.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/mac.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999-2002 Robert N. M. Watson
  * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
  * Copyright (c) 2005-2006 SPARTA, Inc.

Modified: head/sys/sys/mchain.h
==============================================================================
--- head/sys/sys/mchain.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/mchain.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000, 2001 Boris Popov
  * All rights reserved.
  *

Modified: head/sys/sys/memdesc.h
==============================================================================
--- head/sys/sys/memdesc.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/memdesc.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 EMC Corp.
  * All rights reserved.
  *

Modified: head/sys/sys/module.h
==============================================================================
--- head/sys/sys/module.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/module.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Doug Rabson
  * All rights reserved.
  *

Modified: head/sys/sys/module_khelp.h
==============================================================================
--- head/sys/sys/module_khelp.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/module_khelp.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/sys/mqueue.h
==============================================================================
--- head/sys/sys/mqueue.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/mqueue.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/sys/msg.h
==============================================================================
--- head/sys/sys/msg.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/msg.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -4,6 +4,8 @@
 /*-
  * SVID compatible msg.h file
  *
+ * SPDX-License-Identifier: MIT
+ *
  * Author:  Daniel Boulet
  *
  * Copyright 1993 Daniel Boulet and RTMX Inc.

Modified: head/sys/sys/mutex.h
==============================================================================
--- head/sys/sys/mutex.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/mutex.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: head/sys/sys/osd.h
==============================================================================
--- head/sys/sys/osd.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/osd.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/pciio.h
==============================================================================
--- head/sys/sys/pciio.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/pciio.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, Stefan Esser <se@FreeBSD.ORG>
  * Copyright (c) 1997, 1998, 1999, Kenneth D. Merry <ken@FreeBSD.ORG>
  * All rights reserved.

Modified: head/sys/sys/pctrie.h
==============================================================================
--- head/sys/sys/pctrie.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/pctrie.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/pmc.h
==============================================================================
--- head/sys/sys/pmc.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/pmc.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -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/sys/pmckern.h
==============================================================================
--- head/sys/sys/pmckern.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/pmckern.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2007, Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/sys/pmclog.h
==============================================================================
--- head/sys/sys/pmclog.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/pmclog.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005-2007, Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.

Modified: head/sys/sys/poll.h
==============================================================================
--- head/sys/sys/poll.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/poll.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
  * All rights reserved.
  *

Modified: head/sys/sys/power.h
==============================================================================
--- head/sys/sys/power.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/power.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Mitsuru IWASAKI
  * All rights reserved.
  *

Modified: head/sys/sys/priority.h
==============================================================================
--- head/sys/sys/priority.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/priority.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1994, Henrik Vestergaard Draboel
  * All rights reserved.
  *

Modified: head/sys/sys/priv.h
==============================================================================
--- head/sys/sys/priv.h	Mon Nov 27 14:52:40 2017	(r326255)
+++ head/sys/sys/priv.h	Mon Nov 27 15:01:59 2017	(r326256)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2006 nCircle Network Security, Inc.
  * All rights reserved.
  *

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