Brian Behlendorf
|
e74b6f3587
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-10 11:33:41 -08:00 |
|
Brian Behlendorf
|
486d7cac03
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 11:32:09 -08:00 |
|
Brian Behlendorf
|
7baad04134
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 11:32:08 -08:00 |
|
Brian Behlendorf
|
c0fd117de8
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 11:32:08 -08:00 |
|
Brian Behlendorf
|
b910a84f6e
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-10 11:32:07 -08:00 |
|
Brian Behlendorf
|
6d4310200c
|
Fix two missing voids in prototypes
|
2008-12-10 11:30:12 -08:00 |
|
Brian Behlendorf
|
dd3f56983d
|
Add stack_getbounds() and thr_stksegment() interfaces
|
2008-12-10 11:18:37 -08:00 |
|
Brian Behlendorf
|
e0231ea639
|
Fix typo in header
|
2008-12-10 09:34:19 -08:00 |
|
Brian Behlendorf
|
0b519593ac
|
Move thread.h to the correct place
|
2008-12-10 09:30:34 -08:00 |
|
Brian Behlendorf
|
121a43fe19
|
Add threads compat and sysmacro compat
|
2008-12-09 16:55:26 -08:00 |
|
Brian Behlendorf
|
de2041972a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 15:57:16 -08:00 |
|
Brian Behlendorf
|
40f1eae131
|
Add libspl includes to libumem
|
2008-12-09 15:52:41 -08:00 |
|
Brian Behlendorf
|
9609895119
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:57:40 -08:00 |
|
Brian Behlendorf
|
6c745cd2c8
|
Update libumem Makefile to reflect new realities
|
2008-12-09 14:54:45 -08:00 |
|
Brian Behlendorf
|
f826e7c0dc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:42:32 -08:00 |
|
Brian Behlendorf
|
28c0e431c0
|
Refer to moved Makefile
|
2008-12-09 14:39:45 -08:00 |
|
Brian Behlendorf
|
d7604f31b3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:27:04 -08:00 |
|
Brian Behlendorf
|
7489df5960
|
Refresh Makefiles for new files
|
2008-12-09 14:23:45 -08:00 |
|
Brian Behlendorf
|
5328928778
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:18:08 -08:00 |
|
Brian Behlendorf
|
36d7762781
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-09 14:16:39 -08:00 |
|
Brian Behlendorf
|
19f58048cb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-09 14:16:39 -08:00 |
|
Brian Behlendorf
|
12dc44dced
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-09 14:16:38 -08:00 |
|
Brian Behlendorf
|
7d897127c1
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-09 14:16:38 -08:00 |
|
Brian Behlendorf
|
da9682b967
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-09 14:16:37 -08:00 |
|
Brian Behlendorf
|
0416158844
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-09 14:16:36 -08:00 |
|
Brian Behlendorf
|
8795b4a264
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-09 14:16:36 -08:00 |
|
Brian Behlendorf
|
7738478130
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-09 14:16:34 -08:00 |
|
Brian Behlendorf
|
c4ca3271cc
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-09 14:16:34 -08:00 |
|
Brian Behlendorf
|
627f9a3296
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2008-12-09 14:16:33 -08:00 |
|
Brian Behlendorf
|
abc04c23a5
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2008-12-09 14:16:33 -08:00 |
|
Brian Behlendorf
|
cb0aaaa29c
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-09 14:16:32 -08:00 |
|
Brian Behlendorf
|
fdefb041a7
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-09 14:16:31 -08:00 |
|
Brian Behlendorf
|
3e74668176
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2008-12-09 14:16:30 -08:00 |
|
Brian Behlendorf
|
85d4ea4cb0
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-09 14:16:30 -08:00 |
|
Brian Behlendorf
|
28a4cb140c
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-09 14:16:29 -08:00 |
|
Brian Behlendorf
|
a5c7500d30
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-09 14:16:29 -08:00 |
|
Brian Behlendorf
|
9f57596c78
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2008-12-09 14:16:28 -08:00 |
|
Brian Behlendorf
|
4358d79285
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-09 14:16:27 -08:00 |
|
Brian Behlendorf
|
ad09e624d8
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2008-12-09 14:16:26 -08:00 |
|
Brian Behlendorf
|
d4b8a48f81
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-09 14:16:26 -08:00 |
|
Brian Behlendorf
|
10e68eee41
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2008-12-09 14:16:25 -08:00 |
|
Brian Behlendorf
|
ed67495146
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-09 14:16:24 -08:00 |
|
Brian Behlendorf
|
e24c9ae6d4
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2008-12-09 14:16:23 -08:00 |
|
Brian Behlendorf
|
ac4e8d7252
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-09 14:16:23 -08:00 |
|
Brian Behlendorf
|
63f396db56
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-09 14:16:22 -08:00 |
|
Brian Behlendorf
|
34fe60deca
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-09 14:16:22 -08:00 |
|
Brian Behlendorf
|
954c00b5db
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2008-12-09 14:16:21 -08:00 |
|
Brian Behlendorf
|
13a9c19edc
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-09 14:16:20 -08:00 |
|
Brian Behlendorf
|
5c300573f3
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-12-09 14:16:19 -08:00 |
|
Brian Behlendorf
|
f68f5df9f2
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-09 14:16:19 -08:00 |