c7c0e673a3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-28 12:20:31 -07:00
01123eabf6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:20:31 -07:00
8390fe4b4b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 12:20:30 -07:00
fcfae8fbee
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-28 12:20:30 -07:00
c37d6443a4
Revert fix-get-configs should no longer be needed
2010-05-28 12:18:45 -07:00
98e40dfce7
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 16:21:19 -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
c17d3e05eb
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:32:58 -07:00
06cd2491e5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
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
c9eeeb7cbc
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-14 11:00:04 -07:00
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
cb5d1808d5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-04-29 11:01:02 -07:00
4d5d0f9ef5
Include FMA source and headers in build system
2010-04-29 10:55:27 -07:00
9cbaecdd01
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-10 09:58:19 -08:00
7223b8df33
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-10 09:58:04 -08:00
54cf7ab2bc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-10 09:58:03 -08:00
166355dcf0
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-10 09:54:43 -08:00
62a0ac8f22
Fix some incorrect error handling.
...
In vn_open(), if fstat64() returned an error, the real errno
was being obscured by calling close().
Add error handling for both pwrite64() calls in vn_rdwr().
2010-03-10 09:53:53 -08:00
30668cb769
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-09 12:30:26 -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
db77dd0e60
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-14 15:57:34 -07:00
085ed9fe82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-14 15:57:10 -07:00
cb678c0b31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-14 15:57:09 -07:00
a8adb61c00
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-10-14 15:57:08 -07:00
39d85a8b94
Remove pragmas from new libefi files.
2009-10-14 15:44:22 -07:00
0af48bcf91
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-09 16:42:31 -07:00
cb91bbe6ce
Additional set of build system tweaks for libefi library.
2009-10-09 16:37:32 -07:00
1167bd1a6e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-09 16:08:32 -07:00
a0337cfcd8
Add libefi library in to the build system.
2009-10-09 15:58:45 -07:00
5ae21ec0c5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-09 15:43:59 -07:00
e0e0f0ea84
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-09 15:43:33 -07:00
7698515ec4
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-10-09 15:43:30 -07:00
46fa16ed8c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-10-09 15:43:28 -07:00
1af5dcae21
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-10-09 15:43:08 -07:00
5fc177d934
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-10-09 15:43:00 -07:00
9302f90662
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-09 15:42:56 -07:00
926a2e3cc4
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-10-09 15:42:48 -07:00
3728b6d9c1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-10-09 15:42:16 -07:00
1b0e5a1485
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-10-09 15:42:15 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
2d5d5fbc92
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-18 14:19:25 -07:00
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
Brian Behlendorf
Ricardo M. Correia