From owner-svn-src-all@FreeBSD.ORG Wed Oct 26 19:45:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4213C1065670; Wed, 26 Oct 2011 19:45:21 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 283C78FC08; Wed, 26 Oct 2011 19:45:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9QJjLAI064698; Wed, 26 Oct 2011 19:45:21 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QJjKq6064692; Wed, 26 Oct 2011 19:45:20 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201110261945.p9QJjKq6064692@svn.freebsd.org> From: Ken Smith Date: Wed, 26 Oct 2011 19:45:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226809 - in stable/9/sys: amd64/conf i386/conf ia64/conf powerpc/conf sparc64/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 26 Oct 2011 19:45:21 -0000 Author: kensmith Date: Wed Oct 26 19:45:20 2011 New Revision: 226809 URL: http://svn.freebsd.org/changeset/base/226809 Log: MFC r226510,r226547: Comment out sbp(4) because it appears to cause boot failure on some systems. Add comment explaining why sbp(4) is commented out. It was a mistake on my part to omit powerpc's GENERIC for r226510. But when I noticed the mistake I checked with the powerpc maintainer to see if I should correct the mistake Marcel said he'd prefer it be left as-is. Approved by: re (kib) Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC stable/9/sys/ia64/conf/GENERIC stable/9/sys/powerpc/conf/GENERIC stable/9/sys/sparc64/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Wed Oct 26 19:07:36 2011 (r226808) +++ stable/9/sys/amd64/conf/GENERIC Wed Oct 26 19:45:20 2011 (r226809) @@ -320,7 +320,8 @@ device zyd # ZyDAS zd1211/zd1211b wire # FireWire support device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) +# sbp(4) works for some systems but causes boot failure on others +#device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver Modified: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Wed Oct 26 19:07:36 2011 (r226808) +++ stable/9/sys/i386/conf/GENERIC Wed Oct 26 19:45:20 2011 (r226809) @@ -333,7 +333,8 @@ device zyd # ZyDAS zd1211/zd1211b wire # FireWire support device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) +# sbp(4) works for some systems but causes boot failure on others +#device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver Modified: stable/9/sys/ia64/conf/GENERIC ============================================================================== --- stable/9/sys/ia64/conf/GENERIC Wed Oct 26 19:07:36 2011 (r226808) +++ stable/9/sys/ia64/conf/GENERIC Wed Oct 26 19:45:20 2011 (r226809) @@ -166,7 +166,8 @@ device uvscom # USB serial support for # FireWire support device fwip # IP over FireWire (RFC 2734,3146) -device sbp # SCSI over FireWire (need scbus & da) +# sbp(4) works for some systems but causes boot failure on others +#device sbp # SCSI over FireWire (need scbus & da) # Various (pseudo) devices device ether # Ethernet support Modified: stable/9/sys/powerpc/conf/GENERIC ============================================================================== --- stable/9/sys/powerpc/conf/GENERIC Wed Oct 26 19:07:36 2011 (r226808) +++ stable/9/sys/powerpc/conf/GENERIC Wed Oct 26 19:45:20 2011 (r226809) @@ -161,6 +161,7 @@ device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code +# sbp(4) works for some systems but causes boot failure on others device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) Modified: stable/9/sys/sparc64/conf/GENERIC ============================================================================== --- stable/9/sys/sparc64/conf/GENERIC Wed Oct 26 19:07:36 2011 (r226808) +++ stable/9/sys/sparc64/conf/GENERIC Wed Oct 26 19:45:20 2011 (r226809) @@ -250,7 +250,8 @@ device zyd # ZyDAS zd1211/zd1211b wire # FireWire support device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) +# sbp(4) works for some systems but causes boot failure on others +#device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver