From owner-svn-src-head@freebsd.org  Wed Apr  4 02:37:06 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E54F2F87B41;
 Wed,  4 Apr 2018 02:37:05 +0000 (UTC) (envelope-from imp@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 98DEC83531;
 Wed,  4 Apr 2018 02:37:05 +0000 (UTC) (envelope-from imp@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 9315758F2;
 Wed,  4 Apr 2018 02:37:05 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w342b5t4074885;
 Wed, 4 Apr 2018 02:37:05 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w342b5EA074884;
 Wed, 4 Apr 2018 02:37:05 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201804040237.w342b5EA074884@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 4 Apr 2018 02:37:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r331976 - head/sys/modules/cam
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/modules/cam
X-SVN-Commit-Revision: 331976
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: Wed, 04 Apr 2018 02:37:06 -0000

Author: imp
Date: Wed Apr  4 02:37:05 2018
New Revision: 331976
URL: https://svnweb.freebsd.org/changeset/base/331976

Log:
  Add nvme_da back.
  
  Now that it can co-exist in the kernel with nvd, add it back to the
  cam module.
  
  Sponsored by: Netflix

Modified:
  head/sys/modules/cam/Makefile

Modified: head/sys/modules/cam/Makefile
==============================================================================
--- head/sys/modules/cam/Makefile	Wed Apr  4 02:35:48 2018	(r331975)
+++ head/sys/modules/cam/Makefile	Wed Apr  4 02:37:05 2018	(r331976)
@@ -46,6 +46,7 @@ SRCS+=	ata_machdep.c
 SRCS+=	ata_pmp.c
 SRCS+=	nvme_all.c
 SRCS+=	nvme_xpt.c
+SRCS+=	nvme_da.c
 
 EXPORT_SYMS=	YES	# XXX evaluate