From owner-svn-src-all@freebsd.org Fri Jul 31 16:44:59 2015 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 0BB469AFC60; Fri, 31 Jul 2015 16:44:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.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 F11BF1D4E; Fri, 31 Jul 2015 16:44:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6VGiw6a018492; Fri, 31 Jul 2015 16:44:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6VGiwau018490; Fri, 31 Jul 2015 16:44:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507311644.t6VGiwau018490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 31 Jul 2015 16:44:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286135 - in releng/10.2/sys: amd64/conf i386/conf X-SVN-Group: releng 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.20 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: Fri, 31 Jul 2015 16:44:59 -0000 Author: gjb Date: Fri Jul 31 16:44:57 2015 New Revision: 286135 URL: https://svnweb.freebsd.org/changeset/base/286135 Log: MFS r286132: MFC r286131: Pull pmspcv (pms(4)) from GENERIC. It has PCI ID conflicts with ahd(4), mvs(4), and likely other drivers. Approved by: re (implicit, release blocker) Sponsored by: The FreeBSD Foundation Modified: releng/10.2/sys/amd64/conf/GENERIC releng/10.2/sys/i386/conf/GENERIC Directory Properties: releng/10.2/ (props changed) Modified: releng/10.2/sys/amd64/conf/GENERIC ============================================================================== --- releng/10.2/sys/amd64/conf/GENERIC Fri Jul 31 15:54:34 2015 (r286134) +++ releng/10.2/sys/amd64/conf/GENERIC Fri Jul 31 16:44:57 2015 (r286135) @@ -160,7 +160,8 @@ 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 pmspcv # PMC-Sierra SAS/SATA Controller driver +#XXX PCI ID conflicts with ahd(4) and mvs(4) +#device pmspcv # PMC-Sierra SAS/SATA Controller driver #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID Modified: releng/10.2/sys/i386/conf/GENERIC ============================================================================== --- releng/10.2/sys/i386/conf/GENERIC Fri Jul 31 15:54:34 2015 (r286134) +++ releng/10.2/sys/i386/conf/GENERIC Fri Jul 31 16:44:57 2015 (r286135) @@ -166,7 +166,8 @@ 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 pmspcv # PMC-Sierra SAS/SATA Controller driver +#XXX PCI ID conflicts with ahd(4) and mvs(4) +#device pmspcv # PMC-Sierra SAS/SATA Controller driver device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID