From owner-cvs-src@FreeBSD.ORG  Wed Jan  2 07:29:27 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1BB716A419;
	Wed,  2 Jan 2008 07:29:27 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 7440C13C455;
	Wed,  2 Jan 2008 07:29:27 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.1/8.14.1) with ESMTP id m027RpuE050255;
	Wed, 2 Jan 2008 00:27:52 -0700 (MST) (envelope-from imp@bsdimp.com)
Date: Wed, 02 Jan 2008 00:28:07 -0700 (MST)
Message-Id: <20080102.002807.-1183026224.imp@bsdimp.com>
To: scottl@samsco.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <477AEFF9.7000804@samsco.org>
References: <200801020145.m021jVck038228@repoman.freebsd.org>
	<477AEFF9.7000804@samsco.org>
X-Mailer: Mew version 5.2 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, src-committers@FreeBSD.org, cvs-all@FreeBSD.org,
	obrien@FreeBSD.org
Subject: Re: cvs commit: src/sys/cam cam_xpt.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 02 Jan 2008 07:29:27 -0000

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