From owner-cvs-all@FreeBSD.ORG  Fri Aug 29 07:49:59 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 10F101065734;
	Fri, 29 Aug 2008 07:49:57 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CDC5E8FC0A;
	Fri, 29 Aug 2008 07:49:57 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7T7nva1072008;
	Fri, 29 Aug 2008 07:49:57 GMT
	(envelope-from scottl@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7T7nv8T072007;
	Fri, 29 Aug 2008 07:49:57 GMT
	(envelope-from scottl@repoman.freebsd.org)
Message-Id: <200808290749.m7T7nv8T072007@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	scottl@repoman.freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
Date: Fri, 29 Aug 2008 07:49:48 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src/sys/cddl/compat/opensolaris/kern opensolaris_vfs.c
 src/sys/cddl/contrib/opensolaris/common/avl
 avl.c src/sys/cddl/contrib/opensolaris/common/nvpair nvpair.c
 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs vdev_cache.c vdev_queue.c
 zil.c zio.c src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Aug 2008 07:49:59 -0000

scottl      2008-08-29 07:49:48 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/cddl/compat/opensolaris/kern opensolaris_vfs.c 
    sys/cddl/contrib/opensolaris/common/avl avl.c 
    sys/cddl/contrib/opensolaris/common/nvpair nvpair.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs vdev_cache.c 
                                                   vdev_queue.c 
                                                   zil.c zio.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys spa.h 
    sys/cddl/contrib/opensolaris/uts/common/rpc xdr.h 
    sys/cddl/contrib/opensolaris/uts/common/sys byteorder.h 
  Log:
  SVN rev 182436 on 2008-08-29 07:49:48Z by scottl
  
  Fix mismerges in ZFS from the Dtrace merge.
  
  Submitted by:   jhb
  Reviewed by:    pjd
  Approved by:    jb
  
  Revision  Changes    Path
  1.10.2.2  +8 -4      src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  1.3.2.2   +1 -0      src/sys/cddl/contrib/opensolaris/common/avl/avl.c
  1.3.2.2   +1 -1      src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
  1.3.2.2   +1 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  1.3.2.2   +4 -4      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  1.3.2.2   +1 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  1.4.2.2   +1 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  1.5.2.2   +2 -2      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  1.3.2.2   +1 -1      src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  1.3.2.2   +2 -2      src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h