From owner-cvs-sys Sun Dec 22 07:52:16 1996 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id HAA08308 for cvs-sys-outgoing; Sun, 22 Dec 1996 07:52:16 -0800 (PST) Received: from irz301.inf.tu-dresden.de (irz301.inf.tu-dresden.de [141.76.1.11]) by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id HAA08232; Sun, 22 Dec 1996 07:51:46 -0800 (PST) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by irz301.inf.tu-dresden.de (8.6.12/8.6.12-s1) with ESMTP id QAA26739; Sun, 22 Dec 1996 16:51:40 +0100 Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id QAA27456; Sun, 22 Dec 1996 16:51:40 +0100 Received: (from j@localhost) by uriah.heep.sax.de (8.8.4/8.6.9) id QAA14850; Sun, 22 Dec 1996 16:42:20 +0100 (MET) From: J Wunsch Message-Id: <199612221542.QAA14850@uriah.heep.sax.de> Subject: Re: cvs commit: src/sys/pc98/i386 machdep.c To: kato@freefall.freebsd.org (KATO Takenori) Date: Sun, 22 Dec 1996 16:42:20 +0100 (MET) Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) In-Reply-To: <199612150918.BAA07187@freefall.freebsd.org> from KATO Takenori at "Dec 15, 96 01:18:49 am" 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 X-Mailer: ELM [version 2.4ME+ PL17 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As KATO Takenori wrote: > Modified: sys/pc98/i386 machdep.c > Log: > Synchronize with sys/i386/i386/machdep.c revision 1.220. > Definite 2.2 candidate. > > Revision Changes Path > 1.20 +7 -9 src/sys/pc98/i386/machdep.c Not yet merged into 2.2. When reviewing the diff, i notice that the 2.2 mainstream version still has references to b_cylin, while the PC98 version would no longer have. Please merge yourself, Mr. KATO, if you're confident that this is the right thing. After all, you will be most affected by a wrong merge here... -- 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. ;-)