From owner-svn-src-stable-10@FreeBSD.ORG Sun Sep 7 18:43:27 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 778486AE; Sun, 7 Sep 2014 18:43:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 49C3F1CF0; Sun, 7 Sep 2014 18:43:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s87IhRSG040476; Sun, 7 Sep 2014 18:43:27 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s87IhQjH040473; Sun, 7 Sep 2014 18:43:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201409071843.s87IhQjH040473@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 7 Sep 2014 18:43:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r271234 - in stable/10/sys: amd64/conf conf i386/conf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2014 18:43:27 -0000 Author: markj Date: Sun Sep 7 18:43:26 2014 New Revision: 271234 URL: http://svnweb.freebsd.org/changeset/base/271234 Log: MFC r271137: Add mrsas(4) to GENERIC for i386 and amd64. Approved by: re (gjb) Modified: stable/10/sys/amd64/conf/GENERIC stable/10/sys/conf/NOTES stable/10/sys/i386/conf/GENERIC Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/conf/GENERIC ============================================================================== --- stable/10/sys/amd64/conf/GENERIC Sun Sep 7 18:42:45 2014 (r271233) +++ stable/10/sys/amd64/conf/GENERIC Sun Sep 7 18:43:26 2014 (r271234) @@ -156,6 +156,7 @@ device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID Modified: stable/10/sys/conf/NOTES ============================================================================== --- stable/10/sys/conf/NOTES Sun Sep 7 18:42:45 2014 (r271233) +++ stable/10/sys/conf/NOTES Sun Sep 7 18:43:26 2014 (r271234) @@ -1672,6 +1672,7 @@ device amrp # SCSI Passthrough interfa device mfi # LSI MegaRAID SAS device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s # # 3ware ATA RAID Modified: stable/10/sys/i386/conf/GENERIC ============================================================================== --- stable/10/sys/i386/conf/GENERIC Sun Sep 7 18:42:45 2014 (r271233) +++ stable/10/sys/i386/conf/GENERIC Sun Sep 7 18:43:26 2014 (r271234) @@ -162,6 +162,7 @@ device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID