Partial merge of the SPDX changes

These changes are incomplete but are making it difficult
to determine what other changes can/should be merged.

No objections from:	pfg

18 files changed, 40 insertions, 5 deletions

diff --git a/tools/regression/aio/aiop/aiop.c b/tools/regression/aio/aiop/aiop.c
index 98a176e..20e0a2c 100644
--- a/tools/regression/aio/aiop/aiop.c
+++ b/tools/regression/aio/aiop/aiop.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2002 Adrian Chadd <adrian@FreeBSD.org>.
  * All rights reserved.
  *
diff --git a/tools/regression/p1003_1b/fifo.c b/tools/regression/p1003_1b/fifo.c
index 925e7c2..bf8fae0 100644
--- a/tools/regression/p1003_1b/fifo.c
+++ b/tools/regression/p1003_1b/fifo.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996 - 2000
  *	HD Associates, Inc.  All rights reserved.
  *
diff --git a/tools/regression/p1003_1b/memlock.c b/tools/regression/p1003_1b/memlock.c
index b55b405..3033fbb 100644
--- a/tools/regression/p1003_1b/memlock.c
+++ b/tools/regression/p1003_1b/memlock.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996 - 1999
  *	HD Associates, Inc.  All rights reserved.
  *
diff --git a/tools/regression/p1003_1b/p26.c b/tools/regression/p1003_1b/p26.c
index 538deaf..ae869bf 100644
--- a/tools/regression/p1003_1b/p26.c
+++ b/tools/regression/p1003_1b/p26.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996-1999
  *	HD Associates, Inc.  All rights reserved.
  *
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index 1814c79..ea6fcc7 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996-1999
  *	HD Associates, Inc.  All rights reserved.
  *
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index a9b7bad..479ce50 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996-1999
  *	HD Associates, Inc.  All rights reserved.
  *
diff --git a/tools/regression/posixsem/posixsem.c b/tools/regression/posixsem/posixsem.c
index 6401b5c..693a923 100644
--- a/tools/regression/posixsem/posixsem.c
+++ b/tools/regression/posixsem/posixsem.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2008 Yahoo!, Inc.
  * All rights reserved.
  * Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/regression/posixsem/test.c b/tools/regression/posixsem/test.c
index 8583a0d..bd30973 100644
--- a/tools/regression/posixsem/test.c
+++ b/tools/regression/posixsem/test.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2008 Yahoo!, Inc.
  * All rights reserved.
  * Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/regression/posixsem/test.h b/tools/regression/posixsem/test.h
index 505679b..39f3c2f 100644
--- a/tools/regression/posixsem/test.h
+++ b/tools/regression/posixsem/test.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2008 Yahoo!, Inc.
  * All rights reserved.
  * Written by: John Baldwin <jhb@FreeBSD.org>
diff --git a/tools/test/hwpmc/pmctest.py b/tools/test/hwpmc/pmctest.py
index 9265dde..51f5831 100755
--- a/tools/test/hwpmc/pmctest.py
+++ b/tools/test/hwpmc/pmctest.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 2012, Neville-Neil Consulting
 # All rights reserved.
 #
diff --git a/tools/tools/cxgbtool/cxgbtool.c b/tools/tools/cxgbtool/cxgbtool.c
index 8eaaf28..a78c793 100644
--- a/tools/tools/cxgbtool/cxgbtool.c
+++ b/tools/tools/cxgbtool/cxgbtool.c
@@ -1,4 +1,5 @@
 /**************************************************************************
+SPDX-License-Identifier: BSD-3-Clause
 
 Copyright (c) 2007-2010, Chelsio Inc.
 All rights reserved.
diff --git a/tools/tools/pirtool/pirtable.h b/tools/tools/pirtool/pirtable.h
index 86bed66..6435531 100644
--- a/tools/tools/pirtool/pirtable.h
+++ b/tools/tools/pirtool/pirtable.h
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2002-2006 Bruce M. Simpson.
  * All rights reserved.
  *
diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c
index 2b854cc..3484eb5 100644
--- a/tools/tools/pirtool/pirtool.c
+++ b/tools/tools/pirtool/pirtool.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2002-2006 Bruce M. Simpson.
  * All rights reserved
  *
diff --git a/tools/tools/vxge/vxge_cmn.h b/tools/tools/vxge/vxge_cmn.h
index bd34cf3..e6657e8 100644
--- a/tools/tools/vxge/vxge_cmn.h
+++ b/tools/tools/vxge/vxge_cmn.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright(c) 2002-2011 Exar Corp.
  * All rights reserved.
  *
diff --git a/tools/tools/vxge/vxge_info.c b/tools/tools/vxge/vxge_info.c
index d213d87..2eda5bf 100644
--- a/tools/tools/vxge/vxge_info.c
+++ b/tools/tools/vxge/vxge_info.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright(c) 2002-2011 Exar Corp.
  * All rights reserved.
  *
diff --git a/tools/tools/vxge/vxge_info.h b/tools/tools/vxge/vxge_info.h
index cffa956..85f080a 100644
--- a/tools/tools/vxge/vxge_info.h
+++ b/tools/tools/vxge/vxge_info.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright(c) 2002-2011 Exar Corp.
  * All rights reserved.
  *
diff --git a/tools/tools/vxge/vxge_log.c b/tools/tools/vxge/vxge_log.c
index 9430162..7af44fd 100644
--- a/tools/tools/vxge/vxge_log.c
+++ b/tools/tools/vxge/vxge_log.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright(c) 2002-2011 Exar Corp.
  * All rights reserved.
  *
diff --git a/tools/tools/vxge/vxge_log.h b/tools/tools/vxge/vxge_log.h
index b1b951b..5063f22 100644
--- a/tools/tools/vxge/vxge_log.h
+++ b/tools/tools/vxge/vxge_log.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright(c) 2002-2011 Exar Corp.
  * All rights reserved.
  *