Brian Behlendorf
|
06ab7d120f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:25 -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
|
bf09a72b9a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:07:42 -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
|
79e25a5194
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:18 -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
|
8b0a74c863
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:11:31 -08:00 |
|
Brian Behlendorf
|
c72d6b30e8
|
Remove one more header
|
2008-12-22 10:07:53 -08:00 |
|
Brian Behlendorf
|
b608990fea
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 09:25:52 -08:00 |
|
Brian Behlendorf
|
ecf38d314e
|
Resolve conflict
|
2008-12-22 09:25:04 -08:00 |
|
Brian Behlendorf
|
b58e34e0d8
|
Update makefiles
|
2008-12-22 09:22:39 -08:00 |
|
Brian Behlendorf
|
7b9d830da2
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 09:12:06 -08:00 |
|
Brian Behlendorf
|
e959b03a8e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:11:54 -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
|
0a53a422b3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 17:02:16 -08:00 |
|
Brian Behlendorf
|
35336f33ee
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 17:01:54 -08:00 |
|
Brian Behlendorf
|
c8ad9946dc
|
use zlib
|
2008-12-19 16:58:20 -08:00 |
|
Brian Behlendorf
|
15268640a3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 11:06:05 -08:00 |
|
Brian Behlendorf
|
e461d277b9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:05:52 -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
|
eb5fa23261
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 16:21:07 -08:00 |
|
Brian Behlendorf
|
599e4757d3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:40 -08:00 |
|
Brian Behlendorf
|
6481bdc3e7
|
Add -lm linker flag
|
2008-12-17 16:16:22 -08:00 |
|
Brian Behlendorf
|
b0fbfcc592
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:30:22 -08:00 |
|
Brian Behlendorf
|
3b9d2f075b
|
Fix non-void functions without return
|
2008-12-17 14:28:28 -08:00 |
|
Brian Behlendorf
|
8962d81857
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:16:19 -08:00 |
|
Brian Behlendorf
|
74999392aa
|
Wrap share/mount with HAVE_ZPL
|
2008-12-17 14:05:47 -08:00 |
|
Brian Behlendorf
|
772de16021
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:54:18 -08:00 |
|
Brian Behlendorf
|
b1534b904a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 13:53:30 -08:00 |
|
Brian Behlendorf
|
9956c32d10
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:16 -08:00 |
|
Brian Behlendorf
|
1dfec71003
|
Add -pthreads
|
2008-12-17 13:51:11 -08:00 |
|
Brian Behlendorf
|
35257bfbd6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:18:11 -08:00 |