Brian Behlendorf
|
a3ad24a094
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 12:50:37 -08:00 |
|
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
|
Brian Behlendorf
|
b9d6c4c329
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 11:49:39 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
6fcde8f956
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 11:27:00 -08:00 |
|
Brian Behlendorf
|
8c549cdfd6
|
Add MODDIR directory
|
2008-12-23 11:06:08 -08:00 |
|
Brian Behlendorf
|
407ac08489
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-23 10:17:05 -08:00 |
|
Brian Behlendorf
|
4a8619da5f
|
Add module build targets
|
2008-12-23 10:13:07 -08:00 |
|
Brian Behlendorf
|
b8d37fd38d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:56:25 -08:00 |
|
Brian Behlendorf
|
fdffe91056
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:55:59 -08:00 |
|
Brian Behlendorf
|
0844495710
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:58 -08:00 |
|
Brian Behlendorf
|
76a831e0af
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 16:55:56 -08:00 |
|
Brian Behlendorf
|
f6c152354f
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 16:55:55 -08:00 |
|
Brian Behlendorf
|
f3d55cb4f5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:52 -08:00 |
|
Brian Behlendorf
|
0b6064c023
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 16:55:51 -08:00 |
|
Brian Behlendorf
|
30b961af2c
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 16:55:50 -08:00 |
|
Brian Behlendorf
|
3a76148338
|
Add a needed lib
|
2008-12-22 16:52:26 -08:00 |
|
Brian Behlendorf
|
9ef0280a5c
|
Use pthread_
|
2008-12-22 16:51:28 -08:00 |
|
Brian Behlendorf
|
683f0b1d6c
|
Fix cast
|
2008-12-22 16:50:44 -08:00 |
|
Brian Behlendorf
|
704ffcb1a1
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:41:00 -08:00 |
|
Brian Behlendorf
|
44f75e4f86
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:40:35 -08:00 |
|
Brian Behlendorf
|
e8e738e3b9
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:40:34 -08:00 |
|
Brian Behlendorf
|
9f2908cfb5
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 16:40:32 -08:00 |
|
Brian Behlendorf
|
01414a8906
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 16:40:31 -08:00 |
|
Brian Behlendorf
|
f016a8e15f
|
Update patch carried forward from old release
|
2008-12-22 16:35:36 -08:00 |
|
Brian Behlendorf
|
4bdd57c914
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:31:17 -08:00 |
|
Brian Behlendorf
|
36c5ea8174
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:30:37 -08:00 |
|
Brian Behlendorf
|
43abce68c5
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:30:35 -08:00 |
|
Brian Behlendorf
|
f5f002d923
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 16:30:33 -08:00 |
|
Brian Behlendorf
|
153cb8337b
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 16:30:32 -08:00 |
|
Brian Behlendorf
|
8ab0586445
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:30:29 -08:00 |
|
Brian Behlendorf
|
6953ccc7fd
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 16:30:28 -08:00 |
|
Brian Behlendorf
|
a6152094d0
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 16:30:27 -08:00 |
|
Brian Behlendorf
|
dee065ca8d
|
Use pthread versions
|
2008-12-22 16:26:23 -08:00 |
|
Brian Behlendorf
|
50735743b7
|
Err undo that
|
2008-12-22 16:22:28 -08:00 |
|
Brian Behlendorf
|
bb128e51e6
|
Use thread so we can add other goodies beyond simply the pthread base
|
2008-12-22 16:20:36 -08:00 |
|
Brian Behlendorf
|
6a394806f5
|
Prototype fixes
|
2008-12-22 16:18:07 -08:00 |
|
Brian Behlendorf
|
9ac24dd140
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:06:26 -08:00 |
|
Brian Behlendorf
|
419cff0fd3
|
Add more more missing headers
|
2008-12-22 16:02:08 -08:00 |
|
Brian Behlendorf
|
f4d792c2ad
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 15:51:31 -08:00 |
|
Brian Behlendorf
|
d56b3c2440
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:51:14 -08:00 |
|
Brian Behlendorf
|
720f34ffbe
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 15:51:14 -08:00 |
|
Brian Behlendorf
|
70045f227b
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 15:51:13 -08:00 |
|
Brian Behlendorf
|
4c48a5484d
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 15:51:12 -08:00 |
|
Brian Behlendorf
|
f58a0bf4ec
|
Remove now unneeded verify
|
2008-12-22 15:49:13 -08:00 |
|
Brian Behlendorf
|
67a52f2701
|
Add more missing include paths
|
2008-12-22 15:48:05 -08:00 |
|
Brian Behlendorf
|
92528d622c
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 15:36:30 -08:00 |
|
Brian Behlendorf
|
27dd5bca77
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 15:36:15 -08:00 |
|
Brian Behlendorf
|
dfddd3290c
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
1f19965f10
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:36:14 -08:00 |