Date: Fri, 31 Jul 2015 16:44:58 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> 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 Message-ID: <201507311644.t6VGiwau018490@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507311644.t6VGiwau018490>