Brian Behlendorf
|
7fe25e59b1
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-12 13:46:40 -08:00 |
|
Brian Behlendorf
|
4d2df1bc04
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2008-12-12 13:46:40 -08:00 |
|
Brian Behlendorf
|
62b40a0cc2
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-12 13:46:39 -08:00 |
|
Brian Behlendorf
|
3dbc2a89ef
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-12-12 13:46:39 -08:00 |
|
Brian Behlendorf
|
6caaa9d2b1
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-12 13:46:38 -08:00 |
|
Brian Behlendorf
|
895c42c6bf
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-12-12 13:46:38 -08:00 |
|
Brian Behlendorf
|
746076bc95
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-12 13:46:37 -08:00 |
|
Brian Behlendorf
|
e9c54f33b9
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-12 13:46:36 -08:00 |
|
Brian Behlendorf
|
1485b38e92
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-12 13:46:34 -08:00 |
|
Brian Behlendorf
|
e21a7015cd
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-12 13:46:34 -08:00 |
|
Brian Behlendorf
|
c6a4bd8a2e
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:33 -08:00 |
|
Brian Behlendorf
|
415d2e4a1e
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-12 13:46:32 -08:00 |
|
Brian Behlendorf
|
49cfe7da4a
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:31 -08:00 |
|
Brian Behlendorf
|
dfbea5673a
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-12 13:46:30 -08:00 |
|
Brian Behlendorf
|
8ffbf21ee6
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-12 13:46:29 -08:00 |
|
Brian Behlendorf
|
e198681a5c
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:29 -08:00 |
|
Brian Behlendorf
|
9d5295298d
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-12 13:46:27 -08:00 |
|
Brian Behlendorf
|
0ee2e37b8d
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:27 -08:00 |
|
Brian Behlendorf
|
4b741e6dd5
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-12 13:46:25 -08:00 |
|
Brian Behlendorf
|
7fd3f6d8b9
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:25 -08:00 |
|
Brian Behlendorf
|
295cf87bbd
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:24 -08:00 |
|
Brian Behlendorf
|
d941b8ec9c
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-12 13:46:23 -08:00 |
|
Brian Behlendorf
|
b00eb5c285
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-12 13:46:22 -08:00 |
|
Brian Behlendorf
|
bdb0f362c3
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:22 -08:00 |
|
Brian Behlendorf
|
16ad896509
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-12 13:46:20 -08:00 |
|
Brian Behlendorf
|
ad4ff5d2f5
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:20 -08:00 |
|
Brian Behlendorf
|
6bd1d4e45c
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:19 -08:00 |
|
Brian Behlendorf
|
7c63b600b1
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-12 13:46:18 -08:00 |
|
Brian Behlendorf
|
810db7e0a2
|
Remove zcommon reference merged in to zpool
|
2008-12-12 13:41:20 -08:00 |
|
Brian Behlendorf
|
de9d49a2b4
|
Minor mutex tweaks
|
2008-12-12 13:38:13 -08:00 |
|
Brian Behlendorf
|
b127f72a15
|
Resolve mutex conflict
|
2008-12-12 12:55:33 -08:00 |
|
Brian Behlendorf
|
ab95bc7c7b
|
Add missing ;
|
2008-12-12 12:21:58 -08:00 |
|
Brian Behlendorf
|
1ff495a2cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 12:16:41 -08:00 |
|
Brian Behlendorf
|
ac9f5a5af0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 12:13:43 -08:00 |
|
Brian Behlendorf
|
0f99484285
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-12 12:13:41 -08:00 |
|
Brian Behlendorf
|
e1db87107d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-12 12:13:40 -08:00 |
|
Brian Behlendorf
|
95f0795156
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 12:13:39 -08:00 |
|
Brian Behlendorf
|
769681a8b9
|
Trivial umem implementation if portable umem unavailable
|
2008-12-12 12:10:00 -08:00 |
|
Brian Behlendorf
|
ea6e9380e7
|
Add void to prototype
|
2008-12-12 11:12:11 -08:00 |
|
Brian Behlendorf
|
bbaded4a68
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 11:07:48 -08:00 |
|
Brian Behlendorf
|
ded433714f
|
Refine Makefiles
|
2008-12-12 11:04:44 -08:00 |
|
Brian Behlendorf
|
33833181c1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 11:00:07 -08:00 |
|
Brian Behlendorf
|
9fbc572a59
|
Refine Makefiles
|
2008-12-12 10:57:05 -08:00 |
|
Brian Behlendorf
|
bef1b1cd5b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:45:38 -08:00 |
|
Brian Behlendorf
|
d7ec1ed532
|
Refine Makefiles
|
2008-12-12 10:43:39 -08:00 |
|
Brian Behlendorf
|
6d0d603ee1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:38:51 -08:00 |
|
Brian Behlendorf
|
76e1c54125
|
Refine Makefiles
|
2008-12-12 10:36:14 -08:00 |
|
Brian Behlendorf
|
2fcd44d670
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:30:37 -08:00 |
|
Brian Behlendorf
|
f429331a49
|
Remove redundant build options
|
2008-12-12 10:27:10 -08:00 |
|
Brian Behlendorf
|
d06634c325
|
Resolve shadow conflict with 'link' local
|
2008-12-12 10:24:38 -08:00 |