From owner-cvs-all@FreeBSD.ORG Wed Jun 25 13:41:00 2008 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7804E10657FE; Wed, 25 Jun 2008 13:40:59 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 93E1A8FC0C; Wed, 25 Jun 2008 13:40:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [IPv6:2001:470:1f11:75:2a0:d2ff:fe18:8b38]) (authenticated bits=0) by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m5PDedo6058508; Wed, 25 Jun 2008 09:40:52 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: "N.J. Mann" Date: Wed, 25 Jun 2008 09:20:57 -0400 User-Agent: KMail/1.9.7 References: <200806242106.m5OL6ioi048461@repoman.freebsd.org> <20080624213420.GC18932@oberon.njm.f2s.com> In-Reply-To: <20080624213420.GC18932@oberon.njm.f2s.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200806250920.57763.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [IPv6:2001:470:1f11:75::1]); Wed, 25 Jun 2008 09:40:52 -0400 (EDT) X-Virus-Scanned: ClamAV 0.93.1/7542/Mon Jun 23 12:42:14 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,NO_RELAYS autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/dev/ciss ciss.c src/sys/kern kern_mib.c src/sys/pci nfsmb.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2008 13:41:00 -0000 On Tuesday 24 June 2008 05:34:20 pm N.J. Mann wrote: > In message <200806242106.m5OL6ioi048461@repoman.freebsd.org>, > > John Baldwin (jhb@FreeBSD.org) wrote: > > jhb 2008-06-24 21:06:02 UTC > > > > FreeBSD src repository > > > > Modified files: (Branch: RELENG_7) > > sys/dev/ciss ciss.c > > sys/kern kern_mib.c > > sys/pci nfsmb.c > > Log: > > SVN rev 179983 on 2008-06-24 21:06:02Z by jhb > > > > MFC: Add 'compat_freebsd[456]' features corresponding to the kernel > > options COMPAT_FREEBSD[456]. > > > > Revision Changes Path > > 1.81.2.9 +0 -0 src/sys/dev/ciss/ciss.c > > 1.84.2.4 +13 -0 src/sys/kern/kern_mib.c > > 1.6.2.7 +0 -0 src/sys/pci/nfsmb.c > > > > http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/ciss/ciss.c.diff?r1=1.8 > >1.2.8&r2=1.81.2.9 --- src/sys/dev/ciss/ciss.c 2008/06/24 20:04:39 > > 1.81.2.8 +++ src/sys/dev/ciss/ciss.c 2008/06/24 21:06:02 1.81.2.9 > > @@ -24,7 +24,7 @@ > > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY > > OF * SUCH DAMAGE. > > * > > - * $FreeBSD: > > /usr/local/www/cvsroot/FreeBSD/src/sys/dev/ciss/ciss.c,v 1.81.2.8 > > 2008/06/24 20:04:39 jhb Exp $ + * $FreeBSD: > > /usr/local/www/cvsroot/FreeBSD/src/sys/dev/ciss/ciss.c,v 1.81.2.9 > > 2008/06/24 21:06:02 jhb Exp $ */ > > John, > > > Every commit I have seen from you today has include an empty "change" to > ciss.c, including RELENG_7 and RELENG_6. Is there some sort of problem > at you end and/or with svn? It has to do with the way SVN tracks merges. -- John Baldwin