Date: Wed, 02 Jan 2008 00:28:07 -0700 (MST) From: "M. Warner Losh" <imp@bsdimp.com> To: scottl@samsco.org Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org, obrien@FreeBSD.org Subject: Re: cvs commit: src/sys/cam cam_xpt.c Message-ID: <20080102.002807.-1183026224.imp@bsdimp.com> In-Reply-To: <477AEFF9.7000804@samsco.org> References: <200801020145.m021jVck038228@repoman.freebsd.org> <477AEFF9.7000804@samsco.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <477AEFF9.7000804@samsco.org>
Scott Long <scottl@samsco.org> writes:
: David E. O'Brien wrote:
: > obrien 2008-01-02 01:45:31 UTC
: >
: > FreeBSD src repository
: >
: > Modified files:
: > sys/cam cam_xpt.c
: > Log:
: > style(9)
: >
: > Revision Changes Path
: > 1.193 +73 -73 src/sys/cam/cam_xpt.c
:
: Thanks for making CAM merges harder now than they were before. A
: normal, well adjusted team player would have asked the person/people
: working in this area if it was ok to do something like this. What a
: circus. I await your indignant rules lawyering.
Just back it out.
cvs update -j 1.193 -j 1.192 -kk cam_xpt.c
cvs commit -m"Backout style(9), there's locking changes in flight..."
then merging your changes will easy to merge. Sure it tosses David's
work, but locking changes are much more important than style changes
or pissing contests.
Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080102.002807.-1183026224.imp>