Date: Sun, 10 Oct 2004 20:16:25 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: obrien@freebsd.org Cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/i386/isa pbio.c Message-ID: <20041010.201625.23011651.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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041010.201625.23011651.imp>