cvs commit: src/sys/cam cam_xpt.c

[M. Warner Losh]

In message: <477AEFF9.7000804 at samsco.org>
            Scott Long <scottl at 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