Date: Thu, 05 Dec 1996 04:18:43 +0900 From: KATO Takenori <kato@eclogite.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 Message-ID: <199612041918.EAA02912@marble.eps.nagoya-u.ac.jp> In-Reply-To: Your message of "Wed, 04 Dec 1996 20:05:21 %2B0100" References: <4248.849726321@critter.tfs.com>
next in thread | previous in thread | raw e-mail | index | archive | help
From: Poul-Henning Kamp <phk@critter.tfs.com> 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 <kato@eclogite.eps.nagoya-u.ac.jp> Dept. Earth Planet. Sci., Nagoya Univ., Nagoya, 464-01, Japan PGP public key: finger kato@eclogite.eps.nagoya-u.ac.jp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199612041918.EAA02912>