From owner-cvs-sys Tue Mar 11 15:55:42 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA21074 for cvs-sys-outgoing; Tue, 11 Mar 1997 15:55:42 -0800 (PST) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id PAA20925; Tue, 11 Mar 1997 15:53:35 -0800 (PST) Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id AAA14374; Wed, 12 Mar 1997 00:53:04 +0100 Received: (from j@localhost) by uriah.heep.sax.de (8.8.5/8.8.5) id AAA05282; Wed, 12 Mar 1997 00:49:15 +0100 (MET) Message-ID: <19970312004914.VS14732@uriah.heep.sax.de> Date: Wed, 12 Mar 1997 00:49:14 +0100 From: j@uriah.heep.sax.de (J Wunsch) To: se@freefall.freebsd.org (Stefan Esser) Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org Subject: Re: cvs commit: src/sys/i386/isa wdc_p.h wd.c src/sys/conf files src/sys/pci wdc_p.c References: <199703112317.PAA17884@freefall.freebsd.org> X-Mailer: Mutt 0.60_p2-3,5,8-9 Mime-Version: 1.0 X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) In-Reply-To: <199703112317.PAA17884@freefall.freebsd.org>; from Stefan Esser on Mar 11, 1997 15:17:31 -0800 Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Stefan Esser wrote: > Branch: sys/conf RELENG_2_2 > Modified: sys/i386/isa wd.c > sys/conf files > Added: sys/i386/isa wdc_p.h > sys/pci wdc_p.c I think you've accidentally mixed the branches here. The change to sys/conf/files went (only) into RELENG_2_2, while the remaining happened in HEAD. > Revision Changes Path > 1.126 +120 -1 src/sys/i386/isa/wd.c > 1.80.2.6 +1 -0 src/sys/conf/files ^^^^^^^^ Do you have an idea how stable this is, and whether it's dangerous for non-CMD640 users? If not, i wouldn't mind pulling it into 2.2. -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-)