cvs commit: src/sys/i386/isa pbio.c

[M. Warner Losh]

In message: <20041010213606.GA6835 at dragon.nuxi.com>
            "David O'Brien" <obrien at 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