4148574b2d
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-11 09:55:16 -08:00
a48b62fa95
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-11 09:55:16 -08:00
7720159999
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-11 09:55:15 -08:00
4deaf5248c
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-11 09:55:14 -08:00
3f5b4e49ba
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-11 09:55:13 -08:00
c2317af86c
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-11 09:55:13 -08:00
4072724702
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-11 09:55:12 -08:00
99e94880ad
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-11 09:55:11 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -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
e7393825e4
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-09 14:19:56 -08:00
9acc9e9b20
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-09 14:19:56 -08:00
2f0a19285c
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-09 14:19:55 -08:00
8521d73733
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-09 14:19:54 -08:00
cada9b634c
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-09 14:19:53 -08:00
3bacff1e54
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-09 14:19:53 -08:00
94ff11c3e0
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-09 14:19:52 -08:00
342ab93948
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-03-09 14:19:52 -08:00
75ffcce707
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-03-09 14:19:50 -08:00
4d9d0dbbf0
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-03-09 14:19:50 -08:00
c2931dff76
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-03-09 14:19:49 -08:00
889814b195
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-03-09 14:19:49 -08:00
c08729c194
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-03-09 14:19:48 -08:00
be64029df4
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-09 14:19:47 -08:00
001f726de5
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-03-09 14:19:46 -08:00
09c493ba56
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-03-09 14:19:45 -08:00
af42419e00
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-03-09 14:19:44 -08:00
e1057463c2
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-03-09 14:19:44 -08:00
f0f4a7a1c2
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-09 14:19:43 -08:00
ad72ea5360
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-09 14:19:43 -08:00
64f5e0e77b
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-03-09 14:19:42 -08:00
01db66d450
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-09 14:19:41 -08:00
d5b5666f2e
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-09 14:19:40 -08:00
f19f8e5dcc
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-09 14:19:40 -08:00
b1a86e0752
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-09 14:19:39 -08:00
5fc733bc97
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-09 14:19:39 -08:00
8515a07c0f
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-09 14:19:38 -08:00
881d65ec2b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-09 14:19:37 -08:00
60a00a6316
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-09 14:19:36 -08:00
d0389e24d5
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-09 14:19:36 -08:00
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08:00
d285c096c9
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-01-08 11:39:27 -08:00
da35bd5b60
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-01-08 11:39:26 -08:00
050c1617d8
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-01-08 11:39:26 -08:00
3d5d35b616
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-01-08 11:39:26 -08:00
34c0ae76d9
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-01-08 11:39:25 -08:00
fe9ad9171a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-01-08 11:39:25 -08:00
4d11d8d3ef
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-01-08 11:39:24 -08:00
4fc3a7710c
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-01-08 11:39:24 -08:00
Brian Behlendorf
Ricardo M. Correia