37ecc84897
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 16:24:01 -07:00
a08f4edee7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 16:21:20 -07:00
ea431b4dc6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 16:14:04 -07:00
319f69734b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
390995db28
Revert all remaining changes.
2010-05-27 14:25:06 -07:00
4e00654d55
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 13:53:16 -07:00
5cad1e175d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/dmu_tx.c
module/zfs/txg.c
2010-05-27 13:48:54 -07:00
d8e5eb56b8
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:42:00 -07:00
028e42b692
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:42:00 -07:00
cde6e6fec8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-27 13:40:15 -07:00
1e32b3c781
Revert feature-commit-cb feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
4b3317d13f
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 13:37:44 -07:00
95885a2f68
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
2010-05-27 13:35:09 -07:00
c17d3e05eb
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:32:58 -07:00
51536ea5f4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:32:58 -07:00
a082023842
Merge commit 'refs/top-bases/feature-branch' into feature-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c
2010-05-27 13:30:48 -07:00
099e8e493a
Remove feature-pthreads prior to b141 update.
...
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
343bcf823f
Refresh autogen products with automake 1.11.1
2010-05-21 16:04:53 -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
c3240ea0d8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 12:31:56 -08:00
573328741b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 12:30:21 -08:00
8f63d438cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 12:30:18 -08:00
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08: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
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -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
Brian Behlendorf