Brian Behlendorf
|
1ed474aa0d
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-05 11:10:31 -08:00 |
|
Brian Behlendorf
|
36b849fa51
|
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
|
2009-01-05 11:10:13 -08:00 |
|
Brian Behlendorf
|
ee1ca98846
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 16:58:12 -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
|
f3d55cb4f5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:52 -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
|
ec091f4723
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 16:42:58 -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
|
f016a8e15f
|
Update patch carried forward from old release
|
2008-12-22 16:35:36 -08:00 |
|
Brian Behlendorf
|
68e000861c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 16:33:29 -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
|
8ab0586445
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:30:29 -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
|
6a394806f5
|
Prototype fixes
|
2008-12-22 16:18:07 -08:00 |
|
Brian Behlendorf
|
1c03bb100f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 16:08:49 -08:00 |
|
Brian Behlendorf
|
419cff0fd3
|
Add more more missing headers
|
2008-12-22 16:02:08 -08:00 |
|
Brian Behlendorf
|
515c44c49a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 15:52:39 -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
|
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
|
f369d21fa5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 15:37:34 -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
|
1f19965f10
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
262c2c49c1
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 15:36:13 -08:00 |
|
Brian Behlendorf
|
088c5451b7
|
Add missing include
|
2008-12-22 15:34:18 -08:00 |
|
Brian Behlendorf
|
9b3b373d4f
|
Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99
|
2008-12-22 15:33:15 -08:00 |
|
Brian Behlendorf
|
300ff503d4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:42:13 -08:00 |
|
Brian Behlendorf
|
7403ce6856
|
Add missing Makefile foo
|
2008-12-22 11:38:58 -08:00 |
|
Brian Behlendorf
|
87a227044e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:30:44 -08:00 |
|
Brian Behlendorf
|
6b1fc7b8ee
|
Add linker flags
|
2008-12-22 11:27:30 -08:00 |
|
Brian Behlendorf
|
356e666729
|
Add linker flags
|
2008-12-22 11:26:16 -08:00 |
|
Brian Behlendorf
|
9fb38f075b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:25:39 -08:00 |
|
Brian Behlendorf
|
24a90ad2c3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:25:38 -08:00 |
|
Brian Behlendorf
|
34d556babb
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:25:37 -08:00 |
|
Brian Behlendorf
|
7c89e6b7d5
|
Fix prototype
|
2008-12-22 11:25:28 -08:00 |
|
Brian Behlendorf
|
92b3580449
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:09:02 -08:00 |
|
Brian Behlendorf
|
feb8953178
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:07:39 -08:00 |
|
Brian Behlendorf
|
b8245db563
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:38 -08:00 |
|
Brian Behlendorf
|
03c0e92dfa
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
e18ac20f8c
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
feb8aecd47
|
Fix prototype
|
2008-12-22 11:05:41 -08:00 |
|
Brian Behlendorf
|
fdd6fa0727
|
We don't need to #undef verify here, this is handled better now with the verify cleanup
|
2008-12-22 11:02:23 -08:00 |
|
Brian Behlendorf
|
4bf318d0a8
|
Add needed libs
|
2008-12-22 11:00:47 -08:00 |
|
Brian Behlendorf
|
124da899c2
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 10:24:36 -08:00 |
|
Brian Behlendorf
|
a9e37c248d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 10:23:16 -08:00 |
|
Brian Behlendorf
|
342c4d05d6
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 10:23:15 -08:00 |
|
Brian Behlendorf
|
817ecade1a
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 10:23:14 -08:00 |
|
Brian Behlendorf
|
6da71c1404
|
Fix twop more missing voids in prototypes
|
2008-12-22 10:20:57 -08:00 |
|
Brian Behlendorf
|
233dda723f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 09:26:58 -08:00 |
|
Brian Behlendorf
|
b58e34e0d8
|
Update makefiles
|
2008-12-22 09:22:39 -08:00 |
|
Brian Behlendorf
|
d1ff9a15ca
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 09:13:13 -08:00 |
|
Brian Behlendorf
|
98810ac9fb
|
Update zpool Makefile
|
2008-12-22 09:10:00 -08:00 |
|
Brian Behlendorf
|
cb859a27ba
|
Add librt for clock_gettime
|
2008-12-22 09:06:24 -08:00 |
|
Brian Behlendorf
|
0f083e890f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 17:04:23 -08:00 |
|
Brian Behlendorf
|
c8ad9946dc
|
use zlib
|
2008-12-19 16:58:20 -08:00 |
|
Brian Behlendorf
|
5f5472f79c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 11:07:10 -08:00 |
|
Brian Behlendorf
|
cc92d6497b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
d67cf69e08
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
893a49fa9a
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 11:05:48 -08:00 |
|
Brian Behlendorf
|
9041f66bad
|
Fix all instances of for (int i;;) {} that were easily found
|
2008-12-19 11:03:54 -08:00 |
|
Brian Behlendorf
|
dd942458fd
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 16:23:22 -08:00 |
|
Brian Behlendorf
|
6481bdc3e7
|
Add -lm linker flag
|
2008-12-17 16:16:22 -08:00 |
|
Brian Behlendorf
|
5029749a10
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:54:58 -08:00 |
|
Brian Behlendorf
|
1dfec71003
|
Add -pthreads
|
2008-12-17 13:51:11 -08:00 |
|
Brian Behlendorf
|
a2b11e4955
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:18:33 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
dd44909120
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 10:21:33 -08:00 |
|
Brian Behlendorf
|
0209bfd7a4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 10:20:16 -08:00 |
|
Brian Behlendorf
|
137c1015bd
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 10:20:15 -08:00 |
|
Brian Behlendorf
|
d4c1e8b600
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-17 10:20:14 -08:00 |
|
Brian Behlendorf
|
087b2876bb
|
Fix NULL should be 0 usage
|
2008-12-17 10:18:09 -08:00 |
|
Brian Behlendorf
|
2e7ed86503
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 09:25:56 -08:00 |
|
Brian Behlendorf
|
640c2f8d7e
|
Add missing includes to zfs cmd Makefile.am
|
2008-12-17 09:22:40 -08:00 |
|
Brian Behlendorf
|
55899e4342
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:59:07 -08:00 |
|
Brian Behlendorf
|
1e64eb4c07
|
Update makefiles for currently working tools
|
2008-12-16 16:51:23 -08:00 |
|
Brian Behlendorf
|
bf01b1ccdf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 09:06:12 -08:00 |
|
Brian Behlendorf
|
a7b063d224
|
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
|
2008-12-16 08:58:41 -08:00 |
|
Brian Behlendorf
|
450502ec0b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 09:23:28 -08:00 |
|
Brian Behlendorf
|
7005de9a0c
|
Refresh Makefile.am's
|
2008-12-12 09:20:33 -08:00 |
|
Brian Behlendorf
|
06c36a4115
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 08:53:24 -08:00 |
|
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
|
Brian Behlendorf
|
645c51287f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 11:37:35 -08:00 |
|
Brian Behlendorf
|
f07f82e93a
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-11 11:26:43 -08:00 |
|
Brian Behlendorf
|
756a122d37
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 11:25:42 -08:00 |
|
Brian Behlendorf
|
b342e90e44
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 11:24:51 -08:00 |
|
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -08:00 |
|
Brian Behlendorf
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |