From owner-cvs-sys Wed Dec 4 11:18:51 1996 Return-Path: owner-cvs-sys Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id LAA16902 for cvs-sys-outgoing; Wed, 4 Dec 1996 11:18:51 -0800 (PST) Received: from marble.eps.nagoya-u.ac.jp (marble.eps.nagoya-u.ac.jp [133.6.57.68]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id LAA16894; Wed, 4 Dec 1996 11:18:48 -0800 (PST) Received: from marble.eps.nagoya-u.ac.jp (localhost [127.0.0.1]) by marble.eps.nagoya-u.ac.jp (8.8.4/3.4W4) with ESMTP id EAA02912; Thu, 5 Dec 1996 04:18:43 +0900 (JST) Message-Id: <199612041918.EAA02912@marble.eps.nagoya-u.ac.jp> To: phk@critter.tfs.com Cc: kato@eclogite.eps.nagoya-u.ac.jp, phk@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org Subject: Re: cvs commit: src/sys/pc98/boot/biosboot Makefile bios.S src/sys/pc98/i386 locore.s machdep.c userconfig.c src/sys/pc98/pc98 diskslice_machdep.c fd.c ft.c if_ed.c if_fe.c lpt.c npx.c sio.c syscons.c syscons.h wd.c kbd.h sbic55.c sbic55.c.new sbicreg.h sbicvar.h scsireg.h src/sys/pc98/conf GENERIC98 files.pc98 options.pc98 In-Reply-To: Your message of "Wed, 04 Dec 1996 20:05:21 +0100" References: <4248.849726321@critter.tfs.com> X-Mailer: Mew version 1.06 on Emacs 19.28.1, Mule 2.3 X-PGP-Fingerprint: 03 72 85 36 62 46 23 03 52 B1 10 22 44 10 0D 9E Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Date: Thu, 05 Dec 1996 04:18:43 +0900 From: KATO Takenori Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk From: Poul-Henning Kamp Date: Wed, 04 Dec 1996 20:05:21 +0100 > Well, I generally merge from current, so if you want current and 2.2 > to be different, you have to tell me that very explicitly. Ah, I thought I should explicitly show 2.2 candidate when our change should be in 2.2, so that I asked Mr. Asami to add `2.2 candidate' or something like it in commit log. I will be careful about this. > So what do you want me to do here ? I will let you know later. (It is 4 am in Japan :) ---- KATO Takenori Dept. Earth Planet. Sci., Nagoya Univ., Nagoya, 464-01, Japan PGP public key: finger kato@eclogite.eps.nagoya-u.ac.jp