98c6ae53c8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-28 22:25:41 -07:00
812761eac5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 15:46:10 -07:00
3e2be634a5
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
2010-05-28 15:34:57 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
343bcf823f
Refresh autogen products with automake 1.11.1
2010-05-21 16:04:53 -07:00
b1be987202
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 12:53:06 -07:00
2a80af91ed
Remove nvpair_alloc_system.c change in libspl topic branch.
...
A change to the nvpair implementation should not have been made in
the libspl-topic branch. This patch fixes that accident by reverting
the change and providing the missing libspl header to allow the
proper building of nvpair_alloc_system.c without the need to modify it.
2010-05-18 12:47:08 -07:00
6e06d537fe
Refresh autogen products
2010-05-14 13:36:31 -07:00
500e506883
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-14 11:01:48 -07:00
821a652a56
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-14 11:01:17 -07:00
6ae8aa39ab
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-14 10:59:57 -07:00
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
34edbcd956
Refresh autogen products
2010-03-26 15:57:19 -07:00
ddb2e7a5c5
Refresh autogen products
2010-03-22 17:01:13 -07:00
02d15b4e4f
Refresh autogen products
2010-03-08 10:57:16 -08:00
9b473082fa
Refresh autogen products
2009-12-23 14:53:51 -08:00
840aa5356d
Refresh autogen products
2009-11-20 12:14:59 -08:00
81c56431ae
Refresh autogen products
2009-11-16 10:42:39 -08:00
75b67634af
Refresh autogen products.
2009-11-12 12:57:46 -08:00
f11e5e26e2
Refresh autogen products
2009-10-23 12:34:20 -07:00
69c211131d
Refresh autogen products
2009-10-15 16:46:45 -07:00
d1e18d0e3b
Refresh autogen products
2009-10-14 16:00:33 -07:00
00c6a706a5
Refresh autogen products
2009-10-09 16:46:19 -07:00
1f8a43f7a2
Refresh autogen products
2009-08-17 21:58:33 -07:00
535dab57d2
Refresh autogen products.
2009-07-29 17:54:49 -07:00
8feebe7d65
Refresh autogen products
2009-07-16 10:29:59 -07:00
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
808e542240
Refresh autogen products
2009-03-12 11:06:21 -07:00
0b5ddcfdca
Refresh autogen products
2009-03-11 22:31:29 -07:00
8cb718a76c
Refresh autogen products
2009-03-11 14:25:09 -07:00
b8dd7de0b5
Refresh autogen products
2009-03-11 13:30:38 -07:00
8927c974cf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 11:22:46 -07:00
3a23753b70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 11:20:30 -07:00
bf200630f9
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
2009-03-11 11:12:24 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
9855548496
Refresh autogen products
2009-01-09 11:35:52 -08:00
9403f4a605
Refresh autogen products
2008-12-23 12:39:25 -08:00
d8c0d57440
Refresh autogen products
2008-12-23 10:41:37 -08:00
3d2e368e7a
Refresh autogen products
2008-12-19 16:12:00 -08:00
3da25300e3
Refresh autogen products
2008-12-18 14:02:22 -08:00
8e0b1b519e
Refresh autogen products
2008-12-17 13:39:34 -08:00
fd77571d28
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-17 13:38:46 -08:00
c1e34481d8
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 13:38:38 -08:00
Brian Behlendorf
Ricardo M. Correia