From owner-svn-src-all@freebsd.org Tue Jan 16 23:08:26 2018 Return-Path: Delivered-To: svn-src-all@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 B0238EBE82F; Tue, 16 Jan 2018 23:08:26 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A20F719C5; Tue, 16 Jan 2018 23:08:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF5E92700B; Tue, 16 Jan 2018 23:08:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0GN8PeB020155; Tue, 16 Jan 2018 23:08:25 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0GN8PtI020154; Tue, 16 Jan 2018 23:08:25 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201801162308.w0GN8PtI020154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 16 Jan 2018 23:08:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328067 - head/sys/cam/scsi X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/sys/cam/scsi X-SVN-Commit-Revision: 328067 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2018 23:08:26 -0000 Author: pfg Date: Tue Jan 16 23:08:25 2018 New Revision: 328067 URL: https://svnweb.freebsd.org/changeset/base/328067 Log: scsi_ch.c: Small cleanups to the comments. Move the the NetBSD tag near to the related licence. Update it to reflect better the point where we started diverging. Use grouping parenthesis for the SPDX tag. No functional change. Modified: head/sys/cam/scsi/scsi_ch.c Modified: head/sys/cam/scsi/scsi_ch.c ============================================================================== --- head/sys/cam/scsi/scsi_ch.c Tue Jan 16 21:58:38 2018 (r328066) +++ head/sys/cam/scsi/scsi_ch.c Tue Jan 16 23:08:25 2018 (r328067) @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause + * 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. @@ -27,12 +27,6 @@ * SUCH DAMAGE. */ -/* - * Derived from the NetBSD SCSI changer driver. - * - * $NetBSD: ch.c,v 1.32 1998/01/12 09:49:12 thorpej Exp $ - * - */ /*- * Copyright (c) 1996, 1997 Jason R. Thorpe * All rights reserved. @@ -67,6 +61,8 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $NetBSD: ch.c,v 1.34 1998/08/31 22:28:06 cgd Exp $ */ #include