Brian Behlendorf
|
9cf076706b
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 13:31:45 -08:00 |
|
Brian Behlendorf
|
914669907b
|
Change -lzport to -lspl
|
2008-12-10 13:29:14 -08:00 |
|
Brian Behlendorf
|
5fbc78cf12
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 12:55:05 -08:00 |
|
Brian Behlendorf
|
ff70433ccb
|
Strip umem related makefile, libumem now lives in the official upstream libumem portability library
|
2008-12-10 12:52:17 -08:00 |
|
Brian Behlendorf
|
fbb34083f0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 12:46:18 -08:00 |
|
Brian Behlendorf
|
7d4c8081ae
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 12:45:17 -08:00 |
|
Brian Behlendorf
|
19921e591e
|
Removed file
|
2008-12-10 12:44:08 -08:00 |
|
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
|
8ef9f63243
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 11:59:57 -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
|
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
|
daf1a5cf2e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 11:32:38 -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
|
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
|
a40ec7da7b
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 15:56:15 -08:00 |
|
Brian Behlendorf
|
40f1eae131
|
Add libspl includes to libumem
|
2008-12-09 15:52:41 -08:00 |
|
Brian Behlendorf
|
c063790f4c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 14:56:40 -08:00 |
|
Brian Behlendorf
|
6c745cd2c8
|
Update libumem Makefile to reflect new realities
|
2008-12-09 14:54:45 -08:00 |
|
Brian Behlendorf
|
f4f9582bd5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 14:26:05 -08:00 |
|
Brian Behlendorf
|
7489df5960
|
Refresh Makefiles for new files
|
2008-12-09 14:23:45 -08:00 |
|
Brian Behlendorf
|
2626a4d563
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 14:17:08 -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
|
104396b70f
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-09 14:16:13 -08:00 |
|
Brian Behlendorf
|
23818c2a8a
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-09 14:16:04 -08:00 |
|
Brian Behlendorf
|
99028a91ec
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-09 14:15:59 -08:00 |
|
Brian Behlendorf
|
98c1df5b37
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-09 14:15:58 -08:00 |
|
Brian Behlendorf
|
e3afcb6227
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-09 14:15:57 -08:00 |
|
Brian Behlendorf
|
5e97ed8493
|
Move vmem* to libumem
|
2008-12-09 14:14:00 -08:00 |
|
Brian Behlendorf
|
8e5dafd100
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 13:58:08 -08:00 |
|
Brian Behlendorf
|
1654a48217
|
Build system update
|
2008-12-09 13:46:53 -08:00 |
|
Brian Behlendorf
|
4c65dc7197
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 13:42:31 -08:00 |
|
Brian Behlendorf
|
cc5274f04e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-09 13:41:02 -08:00 |
|
Brian Behlendorf
|
8f660a1384
|
Resolve conflict
|
2008-12-09 13:39:42 -08:00 |
|
Brian Behlendorf
|
57b9808aee
|
Resolve conflict
|
2008-12-09 13:39:09 -08:00 |
|
Brian Behlendorf
|
bff5c51344
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-09 13:38:33 -08:00 |
|
Brian Behlendorf
|
bde4b75732
|
Resolve conflict
|
2008-12-09 13:38:29 -08:00 |
|
Brian Behlendorf
|
d2b7b2c0de
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-09 13:34:12 -08:00 |
|
Brian Behlendorf
|
48343be6a3
|
Temporarily move taskq+util to libzpool until that directory is broken in to lib+module
|
2008-12-09 13:32:01 -08:00 |
|
Brian Behlendorf
|
5751784328
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 16:47:59 -08:00 |
|
Brian Behlendorf
|
eb4c9bf039
|
Update makefiles, kernel.c moved to libzpool
|
2008-12-08 16:41:14 -08:00 |
|
Brian Behlendorf
|
35055f5f72
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 16:26:34 -08:00 |
|
Brian Behlendorf
|
4caa960910
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 16:25:36 -08:00 |
|
Brian Behlendorf
|
2df3f3637d
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 16:24:45 -08:00 |
|
Brian Behlendorf
|
9389cd1802
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-08 16:24:27 -08:00 |
|
Brian Behlendorf
|
fbcf47642b
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-08 16:24:17 -08:00 |