From owner-cvs-src@FreeBSD.ORG  Mon Oct 11 02:15:54 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 705AD16A4CE; Mon, 11 Oct 2004 02:15:54 +0000 (GMT)
Received: from harmony.village.org (rover.village.org [168.103.84.182])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 14A4C43D2D; Mon, 11 Oct 2004 02:15:54 +0000 (GMT)
	(envelope-from imp@bsdimp.com)
Received: from localhost (harmony.village.org [10.0.0.6])
	by harmony.village.org (8.13.1/8.13.1) with ESMTP id i9B2EYY8089294;
	Sun, 10 Oct 2004 20:14:34 -0600 (MDT)
	(envelope-from imp@bsdimp.com)
Date: Sun, 10 Oct 2004 20:16:25 -0600 (MDT)
Message-Id: <20041010.201625.23011651.imp@bsdimp.com>
To: obrien@freebsd.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <20041010213606.GA6835@dragon.nuxi.com>
References: <200410090831.i998VLD6076466@repoman.freebsd.org>
	<20041009.210103.115654872.imp@bsdimp.com>
	<20041010213606.GA6835@dragon.nuxi.com>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: cvs-src@freebsd.org
cc: src-committers@freebsd.org
cc: cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/i386/isa pbio.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Oct 2004 02:15:54 -0000

In message: <20041010213606.GA6835@dragon.nuxi.com>
            "David O'Brien" <obrien@FreeBSD.org> writes:
: As I said I think it is a little harsh to take the position your work is
: killed.  You can (1) copy your sys/i386/isa/.#pbio.c.1.1 to pbio.c and
: continue your work, sending me your finished file and I'll re-style(9) it
: before committing.  (2) commit your busspace'ification to RELENG_4 and
: I'll cvs merge it from the branch.

cvs update unexpectedly caused lots of conflicts.  I was annoyed at
that given the gratuitous nature of the changes causing conflict.  I
thought I'd fixed the mis-merge, but wound up committing the
mis-merged stuff later.  I'd forgotten about .#pbio.c.*.  It's fixed
now.

Warner