Date: Fri, 29 Aug 2008 07:49:48 +0000 (UTC) From: Scott Long <scottl@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org 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 ... Message-ID: <200808290749.m7T7nv8T072007@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808290749.m7T7nv8T072007>