Date: Wed, 25 Jun 2008 09:20:57 -0400 From: John Baldwin <jhb@freebsd.org> To: "N.J. Mann" <njm@njm.f2s.com> 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 Message-ID: <200806250920.57763.jhb@freebsd.org> In-Reply-To: <20080624213420.GC18932@oberon.njm.f2s.com> References: <200806242106.m5OL6ioi048461@repoman.freebsd.org> <20080624213420.GC18932@oberon.njm.f2s.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806250920.57763.jhb>