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
5786166a86
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-01-08 11:40:38 -08:00
889f0e5e30
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-01-08 11:39:32 -08:00
303d9f010d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-01-08 11:39:31 -08:00
6cb71e1dec
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:14 -08:00
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -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
126f4128e2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-15 16:46:01 -07:00
c1b4a1ef92
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-15 16:43:40 -07:00
a09d33e929
Update build system for libblkid integration
2009-10-15 16:25:18 -07:00
d1e18d0e3b
Refresh autogen products
2009-10-14 16:00:33 -07:00
81609e1773
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-14 15:59:46 -07:00
aa587c8437
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:13 -07:00
09a8c99097
Additional build system update for libefi library.
...
This include updating all the Makefile.am to have the correct
include paths and libraries. In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles. And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively. The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
00c6a706a5
Refresh autogen products
2009-10-09 16:46:19 -07:00
ae556c9174
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 13:01:34 -07:00
c67303e092
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
e5e4fadc34
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
0f80e41c89
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -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
c58b9ed603
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-06 15:21:26 -07:00
149c4b2731
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -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
51b59652a3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:13:28 -07:00
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -07:00
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
61cd467f6d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 19:58:45 -07:00
Brian Behlendorf