]> granicus.if.org Git - zfs/log
projects / zfs / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
zfs
14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:46:10 +0000 (15:46 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Conflicts:
cmd/ztest/ztest.c

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:45:43 +0000 (15:45 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoMerge branch 'gcc-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:45:38 +0000 (15:45 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c

14 years agoMerge commit 'refs/top-bases/gcc-branch' into gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:39:13 +0000 (15:39 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

14 years agoMerge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:39:12 +0000 (15:39 -0700)]
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:39:07 +0000 (15:39 -0700)]
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch

Conflicts:
lib/libzfs/libzfs_pool.c

14 years agoMerge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:49 +0000 (15:38 -0700)]
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:49 +0000 (15:38 -0700)]
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-unused' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:43 +0000 (15:38 -0700)]
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch

Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c

14 years agoMerge branch 'gcc-uninit' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:11 +0000 (15:38 -0700)]
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:11 +0000 (15:38 -0700)]
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:11 +0000 (15:38 -0700)]
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:38:05 +0000 (15:38 -0700)]
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch

Conflicts:
cmd/zdb/zdb_il.c

14 years agoMerge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:37:36 +0000 (15:37 -0700)]
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-debug' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:37:35 +0000 (15:37 -0700)]
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch

14 years agoMerge branch 'gcc-cast' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:37:31 +0000 (15:37 -0700)]
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c

14 years agoMerge branch 'gcc-c90' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:34:57 +0000 (15:34 -0700)]
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch

Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c

14 years agoMerge commit 'refs/top-bases/gcc-unused' into gcc-unused
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 22:07:36 +0000 (15:07 -0700)]
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused

Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c

14 years agoMerge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:56:00 +0000 (14:56 -0700)]
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
module/zfs/arc.c

14 years agoMerge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:54:33 +0000 (14:54 -0700)]
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis

Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dmu_objset.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c

14 years agoMerge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:49:40 +0000 (14:49 -0700)]
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case

Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c

14 years agoMerge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:46:39 +0000 (14:46 -0700)]
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c

14 years agoMerge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:42:40 +0000 (14:42 -0700)]
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype

Conflicts:
cmd/zdb/zdb_il.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_mount.c

14 years agoMerge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:38:23 +0000 (14:38 -0700)]
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas

Conflicts:
lib/libzfs/libzfs_mount.c

14 years agoMerge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:37:39 +0000 (14:37 -0700)]
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source

Conflicts:
cmd/zdb/zdb.c

14 years agoMerge commit 'refs/top-bases/gcc-debug' into gcc-debug
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:36:35 +0000 (14:36 -0700)]
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug

14 years agoMerge commit 'refs/top-bases/gcc-cast' into gcc-cast
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:36:18 +0000 (14:36 -0700)]
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast

Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c

14 years agoMerge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:30:54 +0000 (14:30 -0700)]
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants

Conflicts:
cmd/ztest/ztest.c
module/zfs/include/sys/zfs_znode.h

14 years agoMerge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:28:49 +0000 (14:28 -0700)]
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas

Conflicts:
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_util.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_import.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/dmu_zfetch.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/zfs_replay.c
module/zfs/zio_compress.c

14 years agoMerge commit 'refs/top-bases/gcc-c90' into gcc-c90
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 21:19:22 +0000 (14:19 -0700)]
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c

14 years agoMerge commit 'refs/top-bases/fix-branch' into fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch

14 years agoMerge branch 'fix-error-handling' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)]
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling

14 years agoMerge branch 'fix-acl' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:53 +0000 (13:54 -0700)]
Merge branch 'fix-acl' into refs/top-bases/fix-branch

14 years agoMerge branch 'fix-deadcode' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:53 +0000 (13:54 -0700)]
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-acl' into fix-acl
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:53 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-acl' into fix-acl

14 years agoMerge branch 'fix-strncat' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:52 +0000 (13:54 -0700)]
Merge branch 'fix-strncat' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:52 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode

14 years agoMerge commit 'refs/top-bases/fix-strncat' into fix-strncat
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:49 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat

Conflicts:
lib/libzfs/libzfs_sendrecv.c

14 years agoMerge branch 'fix-list' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:13 +0000 (13:54 -0700)]
Merge branch 'fix-list' into refs/top-bases/fix-branch

14 years agoMerge branch 'fix-taskq' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-list' into fix-list
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-list' into fix-list

14 years agoMerge commit 'refs/top-bases/fix-taskq' into fix-taskq
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq

14 years agoMerge branch 'fix-stack' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:11 +0000 (13:54 -0700)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-stack' into fix-stack
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:54:08 +0000 (13:54 -0700)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack

Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa_history.c

14 years agoMerge branch 'fix-rwlocks' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:55 +0000 (13:52 -0700)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:52 +0000 (13:52 -0700)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

Conflicts:
module/zfs/dsl_dataset.c

14 years agoMerge branch 'fix-no-zmod' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:29 +0000 (13:52 -0700)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:29 +0000 (13:52 -0700)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod

14 years agoMerge branch 'fix-newlines' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:28 +0000 (13:52 -0700)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch

14 years agoMerge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:28 +0000 (13:52 -0700)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-newlines' into fix-newlines
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:28 +0000 (13:52 -0700)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines

14 years agoMerge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:27 +0000 (13:52 -0700)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:27 +0000 (13:52 -0700)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs

14 years agoMerge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:52:23 +0000 (13:52 -0700)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons

Conflicts:
module/zfs/dnode.c

14 years agoMerge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:51:29 +0000 (13:51 -0700)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch

Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c

14 years agoMerge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:46:45 +0000 (13:46 -0700)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t

Conflicts:
module/zfs/dnode_sync.c

14 years agoUpdate core ZFS code from build 121 to build 141.
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 20:45:14 +0000 (13:45 -0700)]
Update core ZFS code from build 121 to build 141.

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:45:41 +0000 (12:45 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'gcc-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:45:41 +0000 (12:45 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

14 years agoRemove gcc-shadow from gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:44:01 +0000 (12:44 -0700)]
Remove gcc-shadow from gcc-branch

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:42:30 +0000 (12:42 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'gcc-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:42:30 +0000 (12:42 -0700)]
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

14 years agoMerge commit 'refs/top-bases/gcc-branch' into gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:42:30 +0000 (12:42 -0700)]
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

14 years agoMerge branch 'gcc-shadow' into refs/top-bases/gcc-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:42:27 +0000 (12:42 -0700)]
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch

Conflicts:
lib/libzfs/libzfs_util.c

14 years agoRevert gcc-shadow using -Wno-shadow I can live with
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:34:45 +0000 (12:34 -0700)]
Revert gcc-shadow using -Wno-shadow I can live with

While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts.  Anyway, this ends up being
more simply gratutous change than I care for.

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:23:57 +0000 (12:23 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:23:57 +0000 (12:23 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoRemove fix-get-configs dependency from fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:21:44 +0000 (12:21 -0700)]
Remove fix-get-configs dependency from fix-branch

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:20:31 +0000 (12:20 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-get-configs' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:20:30 +0000 (12:20 -0700)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:20:30 +0000 (12:20 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoMerge commit 'refs/top-bases/fix-branch' into fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:20:30 +0000 (12:20 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch

14 years agoRevert fix-get-configs should no longer be needed
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 19:18:45 +0000 (12:18 -0700)]
Revert fix-get-configs should no longer be needed

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:24:56 +0000 (10:24 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:24:56 +0000 (10:24 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoRemove fix-dsl_pool_t dependency from fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:18:41 +0000 (10:18 -0700)]
Remove fix-dsl_pool_t dependency from fix-branch

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:14:43 +0000 (10:14 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:14:43 +0000 (10:14 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoMerge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:14:42 +0000 (10:14 -0700)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-branch' into fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:14:42 +0000 (10:14 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch

14 years agoRevert fix-dsl_pool_t fixed upstream
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:08:02 +0000 (10:08 -0700)]
Revert fix-dsl_pool_t fixed upstream

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:00:44 +0000 (10:00 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:00:44 +0000 (10:00 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoMerge branch 'fix-taskq' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:00:43 +0000 (10:00 -0700)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch

14 years agoMerge commit 'refs/top-bases/fix-branch' into fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 17:00:43 +0000 (10:00 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch

14 years agoRevert fix-taskq changes reevaluate after update.
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 16:54:03 +0000 (09:54 -0700)]
Revert fix-taskq changes reevaluate after update.

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 03:06:10 +0000 (20:06 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 03:06:10 +0000 (20:06 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoRemove fix-clock-wrap dependency from fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 02:59:32 +0000 (19:59 -0700)]
Remove fix-clock-wrap dependency from fix-branch

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 00:02:15 +0000 (17:02 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'fix-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 00:02:14 +0000 (17:02 -0700)]
Merge branch 'fix-branch' into refs/top-bases/zfs-branch

14 years agoMerge commit 'refs/top-bases/fix-branch' into fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 00:02:14 +0000 (17:02 -0700)]
Merge commit 'refs/top-bases/fix-branch' into fix-branch

14 years agoMerge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
commit | commitdiff | tree
Brian Behlendorf [Fri, 28 May 2010 00:02:13 +0000 (17:02 -0700)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch

14 years agoRevert fix-clock-wrap fixed upstream
commit | commitdiff | tree
Brian Behlendorf [Thu, 27 May 2010 23:54:23 +0000 (16:54 -0700)]
Revert fix-clock-wrap fixed upstream

This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.

14 years agoRe-remove feature-branch dependency.
commit | commitdiff | tree
Brian Behlendorf [Thu, 27 May 2010 23:34:02 +0000 (16:34 -0700)]
Re-remove feature-branch dependency.

14 years agoMerge commit 'refs/top-bases/zfs-branch' into zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Thu, 27 May 2010 23:14:04 +0000 (16:14 -0700)]
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

14 years agoMerge branch 'feature-branch' into refs/top-bases/zfs-branch
commit | commitdiff | tree
Brian Behlendorf [Thu, 27 May 2010 23:13:19 +0000 (16:13 -0700)]
Merge branch 'feature-branch' into refs/top-bases/zfs-branch

Conflicts:
cmd/ztest/ztest.c

14 years agoRevert all remaining changes.
commit | commitdiff | tree
Brian Behlendorf [Thu, 27 May 2010 21:25:06 +0000 (14:25 -0700)]
Revert all remaining changes.

14 years agoReadd feature-branch to get the last of the reversions
commit | commitdiff | tree
Brian Behlendorf [Thu, 27 May 2010 21:23:51 +0000 (14:23 -0700)]
Readd feature-branch to get the last of the reversions

next
Unnamed repository; edit this file 'description' to name the repository.