Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Nov 2017 15:12:43 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r326265 - in head/sys/cam: . ata ctl scsi
Message-ID:  <201711271512.vARFChWA001338@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Mon Nov 27 15:12:43 2017
New Revision: 326265
URL: https://svnweb.freebsd.org/changeset/base/326265

Log:
  sys/cam: 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/cam/ata/ata_all.c
  head/sys/cam/ata/ata_all.h
  head/sys/cam/ata/ata_da.c
  head/sys/cam/ata/ata_pmp.c
  head/sys/cam/ata/ata_xpt.c
  head/sys/cam/cam.c
  head/sys/cam/cam.h
  head/sys/cam/cam_ccb.h
  head/sys/cam/cam_compat.c
  head/sys/cam/cam_compat.h
  head/sys/cam/cam_debug.h
  head/sys/cam/cam_periph.c
  head/sys/cam/cam_periph.h
  head/sys/cam/cam_queue.c
  head/sys/cam/cam_queue.h
  head/sys/cam/cam_sim.c
  head/sys/cam/cam_sim.h
  head/sys/cam/cam_xpt.c
  head/sys/cam/cam_xpt.h
  head/sys/cam/cam_xpt_internal.h
  head/sys/cam/cam_xpt_periph.h
  head/sys/cam/cam_xpt_sim.h
  head/sys/cam/ctl/ctl.c
  head/sys/cam/ctl/ctl.h
  head/sys/cam/ctl/ctl_backend.c
  head/sys/cam/ctl/ctl_backend.h
  head/sys/cam/ctl/ctl_backend_block.c
  head/sys/cam/ctl/ctl_backend_ramdisk.c
  head/sys/cam/ctl/ctl_cmd_table.c
  head/sys/cam/ctl/ctl_debug.h
  head/sys/cam/ctl/ctl_error.c
  head/sys/cam/ctl/ctl_error.h
  head/sys/cam/ctl/ctl_frontend.c
  head/sys/cam/ctl/ctl_frontend.h
  head/sys/cam/ctl/ctl_frontend_cam_sim.c
  head/sys/cam/ctl/ctl_frontend_iscsi.c
  head/sys/cam/ctl/ctl_frontend_iscsi.h
  head/sys/cam/ctl/ctl_ha.h
  head/sys/cam/ctl/ctl_io.h
  head/sys/cam/ctl/ctl_ioctl.h
  head/sys/cam/ctl/ctl_private.h
  head/sys/cam/ctl/ctl_scsi_all.c
  head/sys/cam/ctl/ctl_scsi_all.h
  head/sys/cam/ctl/ctl_ser_table.c
  head/sys/cam/ctl/ctl_util.c
  head/sys/cam/ctl/ctl_util.h
  head/sys/cam/ctl/scsi_ctl.c
  head/sys/cam/scsi/scsi_all.c
  head/sys/cam/scsi/scsi_cd.c
  head/sys/cam/scsi/scsi_cd.h
  head/sys/cam/scsi/scsi_ch.c
  head/sys/cam/scsi/scsi_ch.h
  head/sys/cam/scsi/scsi_da.c
  head/sys/cam/scsi/scsi_dvcfg.h
  head/sys/cam/scsi/scsi_enc.c
  head/sys/cam/scsi/scsi_enc_internal.h
  head/sys/cam/scsi/scsi_enc_safte.c
  head/sys/cam/scsi/scsi_enc_ses.c
  head/sys/cam/scsi/scsi_low.c
  head/sys/cam/scsi/scsi_low.h
  head/sys/cam/scsi/scsi_pass.c
  head/sys/cam/scsi/scsi_pass.h
  head/sys/cam/scsi/scsi_pt.c
  head/sys/cam/scsi/scsi_pt.h
  head/sys/cam/scsi/scsi_sa.c
  head/sys/cam/scsi/scsi_sa.h
  head/sys/cam/scsi/scsi_sg.c
  head/sys/cam/scsi/scsi_targ_bh.c
  head/sys/cam/scsi/scsi_target.c
  head/sys/cam/scsi/scsi_targetio.h
  head/sys/cam/scsi/scsi_xpt.c
  head/sys/cam/scsi/smp_all.c
  head/sys/cam/scsi/smp_all.h

Modified: head/sys/cam/ata/ata_all.c
==============================================================================
--- head/sys/cam/ata/ata_all.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ata/ata_all.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/cam/ata/ata_all.h
==============================================================================
--- head/sys/cam/ata/ata_all.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ata/ata_all.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ata/ata_da.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/cam/ata/ata_pmp.c
==============================================================================
--- head/sys/cam/ata/ata_pmp.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ata/ata_pmp.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ata/ata_xpt.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.
  *

Modified: head/sys/cam/cam.c
==============================================================================
--- head/sys/cam/cam.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Generic utility routines for the Common Access Method layer.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam.h
==============================================================================
--- head/sys/cam/cam.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Data structures and definitions for the CAM system.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_ccb.h
==============================================================================
--- head/sys/cam/cam_ccb.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_ccb.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Data structures and definitions for CAM Control Blocks (CCBs).
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_compat.c
==============================================================================
--- head/sys/cam/cam_compat.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_compat.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * CAM ioctl compatibility shims
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Scott Long
  * All rights reserved.
  *

Modified: head/sys/cam/cam_compat.h
==============================================================================
--- head/sys/cam/cam_compat.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_compat.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * CAM ioctl compatibility shims
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2013 Scott Long
  * All rights reserved.
  *

Modified: head/sys/cam/cam_debug.h
==============================================================================
--- head/sys/cam/cam_debug.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_debug.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Macros for tracing/loging information in the CAM layer
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_periph.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Common functions for CAM "type" (peripheral) drivers.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999, 2000 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/cam_periph.h
==============================================================================
--- head/sys/cam/cam_periph.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_periph.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Data structures and definitions for CAM peripheral ("type") drivers.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_queue.c
==============================================================================
--- head/sys/cam/cam_queue.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_queue.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * CAM request queue management functions.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_queue.h
==============================================================================
--- head/sys/cam/cam_queue.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_queue.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * CAM request queue management definitions.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_sim.c
==============================================================================
--- head/sys/cam/cam_sim.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_sim.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Common functions for SCSI Interface Modules (SIMs).
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_sim.h
==============================================================================
--- head/sys/cam/cam_sim.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_sim.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Data structures and definitions for SCSI Interface Modules (SIMs).
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_xpt.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Implementation of the Common Access Method Transport (XPT) layer.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/cam_xpt.h
==============================================================================
--- head/sys/cam/cam_xpt.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_xpt.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -2,6 +2,8 @@
  * Data structures and definitions for dealing with the 
  * Common Access Method Transport (xpt) layer.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_xpt_internal.h
==============================================================================
--- head/sys/cam/cam_xpt_internal.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_xpt_internal.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2009 Scott Long
  * All rights reserved.
  *

Modified: head/sys/cam/cam_xpt_periph.h
==============================================================================
--- head/sys/cam/cam_xpt_periph.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_xpt_periph.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -3,6 +3,8 @@
  * Common Access Method Transport (xpt) layer from peripheral
  * drivers.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/cam_xpt_sim.h
==============================================================================
--- head/sys/cam/cam_xpt_sim.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/cam_xpt_sim.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -2,6 +2,8 @@
  * Data structures and definitions for dealing with the 
  * Common Access Method Transport (xpt) layer.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2009 Silicon Graphics International Corp.
  * Copyright (c) 2012 The FreeBSD Foundation
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>

Modified: head/sys/cam/ctl/ctl.h
==============================================================================
--- head/sys/cam/ctl/ctl.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_backend.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_backend.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_backend.h
==============================================================================
--- head/sys/cam/ctl/ctl_backend.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_backend.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_block.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_backend_block.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2009-2011 Spectra Logic Corporation
  * Copyright (c) 2012 The FreeBSD Foundation

Modified: head/sys/cam/ctl/ctl_backend_ramdisk.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_ramdisk.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_backend_ramdisk.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003, 2008 Silicon Graphics International Corp.
  * Copyright (c) 2012 The FreeBSD Foundation
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>

Modified: head/sys/cam/ctl/ctl_cmd_table.c
==============================================================================
--- head/sys/cam/ctl/ctl_cmd_table.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_cmd_table.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003, 2004, 2005, 2009 Silicon Graphics International Corp.
  * Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_debug.h
==============================================================================
--- head/sys/cam/ctl/ctl_debug.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_debug.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_error.c
==============================================================================
--- head/sys/cam/ctl/ctl_error.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_error.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2009 Silicon Graphics International Corp.
  * Copyright (c) 2011 Spectra Logic Corporation
  * Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>

Modified: head/sys/cam/ctl/ctl_error.h
==============================================================================
--- head/sys/cam/ctl/ctl_error.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_error.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_frontend.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_frontend.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_frontend.h
==============================================================================
--- head/sys/cam/ctl/ctl_frontend.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_frontend.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_frontend_cam_sim.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_cam_sim.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_frontend_cam_sim.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 The FreeBSD Foundation
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_ha.h
==============================================================================
--- head/sys/cam/ctl/ctl_ha.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_ha.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003-2009 Silicon Graphics International Corp.
  * Copyright (c) 2011 Spectra Logic Corporation
  * Copyright (c) 2015 Alexander Motin <mav@FreeBSD.org>

Modified: head/sys/cam/ctl/ctl_io.h
==============================================================================
--- head/sys/cam/ctl/ctl_io.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_io.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_ioctl.h
==============================================================================
--- head/sys/cam/ctl/ctl_ioctl.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_ioctl.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * Copyright (c) 2011 Spectra Logic Corporation
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>

Modified: head/sys/cam/ctl/ctl_private.h
==============================================================================
--- head/sys/cam/ctl/ctl_private.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_private.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003, 2004, 2005, 2008 Silicon Graphics International Corp.
  * Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_scsi_all.c
==============================================================================
--- head/sys/cam/ctl/ctl_scsi_all.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_scsi_all.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Implementation of Utility functions for all SCSI device types.
  *
  * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.

Modified: head/sys/cam/ctl/ctl_scsi_all.h
==============================================================================
--- head/sys/cam/ctl/ctl_scsi_all.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_scsi_all.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 2003 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/ctl/ctl_ser_table.c
==============================================================================
--- head/sys/cam/ctl/ctl_ser_table.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_ser_table.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_util.c
==============================================================================
--- head/sys/cam/ctl/ctl_util.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_util.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/ctl_util.h
==============================================================================
--- head/sys/cam/ctl/ctl_util.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/ctl_util.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003 Silicon Graphics International Corp.
  * All rights reserved.
  *

Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/ctl/scsi_ctl.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008, 2009 Silicon Graphics International Corp.
  * Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_all.c
==============================================================================
--- head/sys/cam/scsi/scsi_all.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_all.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Implementation of Utility functions for all SCSI device types.
  *
  * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_cd.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_cd.h
==============================================================================
--- head/sys/cam/scsi/scsi_cd.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_cd.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000, 2002 Kenneth D. Merry
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_ch.c
==============================================================================
--- head/sys/cam/scsi/scsi_ch.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_ch.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_ch.h
==============================================================================
--- head/sys/cam/scsi/scsi_ch.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_ch.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -2,6 +2,8 @@
 /*	$NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_da.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Implementation of SCSI Direct Access Peripheral driver for CAM.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_dvcfg.h
==============================================================================
--- head/sys/cam/scsi/scsi_dvcfg.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_dvcfg.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -3,6 +3,8 @@
 /*	$NetBSD$	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * [NetBSD for NEC PC-98 series]
  *  Copyright (c) 1994, 1995, 1996, 1997, 1998
  *	NetBSD/pc98 porting staff. All rights reserved.

Modified: head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_enc.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Matthew Jacob
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_enc_internal.h
==============================================================================
--- head/sys/cam/scsi/scsi_enc_internal.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_enc_internal.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Matthew Jacob
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_enc_safte.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_safte.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_enc_safte.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Matthew Jacob
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_enc_ses.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000 Matthew Jacob
  * Copyright (c) 2010 Spectra Logic Corporation
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_low.c
==============================================================================
--- head/sys/cam/scsi/scsi_low.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_low.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -17,6 +17,8 @@ __FBSDID("$FreeBSD$");
 #define	SCSI_LOW_FLAGS_QUIRKS_OK
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * [NetBSD for NEC PC-98 series]
  *  Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
  *	NetBSD/pc98 porting staff. All rights reserved.

Modified: head/sys/cam/scsi/scsi_low.h
==============================================================================
--- head/sys/cam/scsi/scsi_low.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_low.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -6,6 +6,8 @@
 #define	SCSI_LOW_ALT_QTAG_ALLOCATE
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * [NetBSD for NEC PC-98 series]
  *  Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
  *	NetBSD/pc98 porting staff. All rights reserved.

Modified: head/sys/cam/scsi/scsi_pass.c
==============================================================================
--- head/sys/cam/scsi/scsi_pass.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_pass.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_pass.h
==============================================================================
--- head/sys/cam/scsi/scsi_pass.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_pass.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1999 Kenneth D. Merry.
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_pt.c
==============================================================================
--- head/sys/cam/scsi/scsi_pt.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_pt.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Implementation of SCSI Processor Target Peripheral driver for CAM.
  *
  * Copyright (c) 1998 Justin T. Gibbs.

Modified: head/sys/cam/scsi/scsi_pt.h
==============================================================================
--- head/sys/cam/scsi/scsi_pt.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_pt.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Structure and function declarations for Processor type devices.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1998 Justin T. Gibbs
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_sa.c
==============================================================================
--- head/sys/cam/scsi/scsi_sa.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_sa.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Implementation of SCSI Sequential Access Peripheral driver for CAM.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 Matthew Jacob
  * Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_sa.h
==============================================================================
--- head/sys/cam/scsi/scsi_sa.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_sa.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -2,6 +2,8 @@
  * Structure and function declarations for the
  * SCSI Sequential Access Peripheral driver for CAM.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999, 2000 Matthew Jacob
  * Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_sg.c
==============================================================================
--- head/sys/cam/scsi/scsi_sg.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_sg.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007 Scott Long
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_targ_bh.c
==============================================================================
--- head/sys/cam/scsi/scsi_targ_bh.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_targ_bh.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Implementation of the Target Mode 'Black Hole device' for CAM.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1999 Justin T. Gibbs.
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/scsi_target.c
==============================================================================
--- head/sys/cam/scsi/scsi_target.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_target.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Generic SCSI Target Kernel Mode Driver
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Nate Lawson.
  * Copyright (c) 1998, 1999, 2001, 2002 Justin T. Gibbs.
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_targetio.h
==============================================================================
--- head/sys/cam/scsi/scsi_targetio.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_targetio.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Ioctl definitions for the SCSI Target Driver
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2002 Nate Lawson.
  * Copyright (c) 1998 Justin T. Gibbs.
  * All rights reserved.

Modified: head/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- head/sys/cam/scsi/scsi_xpt.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/scsi_xpt.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,6 +1,8 @@
 /*-
  * Implementation of the SCSI Transport
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * All rights reserved.

Modified: head/sys/cam/scsi/smp_all.c
==============================================================================
--- head/sys/cam/scsi/smp_all.c	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/smp_all.c	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 Spectra Logic Corporation
  * All rights reserved.
  *

Modified: head/sys/cam/scsi/smp_all.h
==============================================================================
--- head/sys/cam/scsi/smp_all.h	Mon Nov 27 15:12:14 2017	(r326264)
+++ head/sys/cam/scsi/smp_all.h	Mon Nov 27 15:12:43 2017	(r326265)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2010 Spectra Logic Corporation
  * All rights reserved.
  *



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711271512.vARFChWA001338>