From owner-svn-src-stable-11@freebsd.org  Fri Dec  8 04:21:32 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 D0812E99551;
 Fri,  8 Dec 2017 04:21:32 +0000 (UTC)
 (envelope-from asomers@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 93FCA36A8;
 Fri,  8 Dec 2017 04:21:32 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB84LVol005598;
 Fri, 8 Dec 2017 04:21:31 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB84LVEo005597;
 Fri, 8 Dec 2017 04:21:31 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201712080421.vB84LVEo005597@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Fri, 8 Dec 2017 04:21:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326676 - stable/11/etc
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/11/etc
X-SVN-Commit-Revision: 326676
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Dec 2017 04:21:32 -0000

Author: asomers
Date: Fri Dec  8 04:21:31 2017
New Revision: 326676
URL: https://svnweb.freebsd.org/changeset/base/326676

Log:
  MFC r325812:
  
  devd.conf: add mps and mpr to the scsi controllers regex
  
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D12744

Modified:
  stable/11/etc/devd.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/devd.conf
==============================================================================
--- stable/11/etc/devd.conf	Fri Dec  8 03:49:53 2017	(r326675)
+++ stable/11/etc/devd.conf	Fri Dec  8 04:21:31 2017	(r326676)
@@ -20,8 +20,8 @@ options {
 	#XXX Yes, these are gross -- imp
 	set scsi-controller-regex
 		"(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
-		esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
-		[0-9]+";
+		esp|ida|iir|ips|isp|mlx|mly|mpr|mps|mpt|ncr|ncv|nsp|stg|sym|\
+		trm|wds)[0-9]+";
 	set wifi-driver-regex
 		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\
 		upgt|ural|urtw|urtwn|wi|wpi|wtap|zyd)[0-9]+";