Brian Behlendorf
|
1b59a53bf5
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-10 12:43:44 -08:00 |
|
Brian Behlendorf
|
9e8b1e836c
|
Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library
|
2008-12-10 12:43:20 -08:00 |
|
Brian Behlendorf
|
19b9be254c
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-10 11:59:40 -08:00 |
|
Brian Behlendorf
|
cda625cdfa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 11:59:08 -08:00 |
|
Brian Behlendorf
|
d5c7c0ad86
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 11:59:07 -08:00 |
|
Brian Behlendorf
|
279bebaa30
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 11:59:04 -08:00 |
|
Brian Behlendorf
|
449999be3f
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-10 11:59:03 -08:00 |
|
Brian Behlendorf
|
97751ff9d5
|
Fix bad cast
|
2008-12-10 11:54:08 -08:00 |
|
Brian Behlendorf
|
b79eb2bab6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-10 11:32:24 -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
|
fda2ab1862
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 15:56:02 -08:00 |
|
Brian Behlendorf
|
40f1eae131
|
Add libspl includes to libumem
|
2008-12-09 15:52:41 -08:00 |
|
Brian Behlendorf
|
e7357ba0d1
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:56:26 -08:00 |
|
Brian Behlendorf
|
6c745cd2c8
|
Update libumem Makefile to reflect new realities
|
2008-12-09 14:54:45 -08:00 |
|
Brian Behlendorf
|
309973785f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:41:21 -08:00 |
|
Brian Behlendorf
|
28c0e431c0
|
Refer to moved Makefile
|
2008-12-09 14:39:45 -08:00 |
|
Brian Behlendorf
|
f06b5c462e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:25:51 -08:00 |
|
Brian Behlendorf
|
7489df5960
|
Refresh Makefiles for new files
|
2008-12-09 14:23:45 -08:00 |
|
Brian Behlendorf
|
4768609122
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:16:54 -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
|
8795b4a264
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-09 14:16:36 -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
|
c4ca3271cc
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-09 14:16:34 -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
|
abc04c23a5
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2008-12-09 14:16:33 -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
|
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
|
85d4ea4cb0
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-09 14:16:30 -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
|
a5c7500d30
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-09 14:16:29 -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
|
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
|
d4b8a48f81
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-09 14:16:26 -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
|
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
|
ac4e8d7252
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-09 14:16:23 -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
|
34fe60deca
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-09 14:16:22 -08:00 |
|
Brian Behlendorf
|
63f396db56
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-09 14:16:22 -08:00 |