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
|
94dac841b6
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:08:29 -08:00 |
|
Brian Behlendorf
|
13decb5b30
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:08:16 -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
|
03a0383581
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 11:07:38 -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
|
3c7b37a02c
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 11:07:37 -08:00 |
|
Brian Behlendorf
|
94c9beaefb
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 11:07:35 -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
|
09de417e20
|
Move #endif up to expose userspace bits
|
2008-12-22 11:01:35 -08:00 |
|
Brian Behlendorf
|
4bf318d0a8
|
Add needed libs
|
2008-12-22 11:00:47 -08:00 |
|
Brian Behlendorf
|
c6e93310af
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 10:37:00 -08:00 |
|
Brian Behlendorf
|
bdbd91fe46
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:36:48 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
0e2cb59efb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 10:24:04 -08:00 |
|
Brian Behlendorf
|
25afaa1e57
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:23:52 -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
|
f9e9cd6f18
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 10:23:14 -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
|
4e1fe142d3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 09:26:26 -08:00 |
|
Brian Behlendorf
|
978bee45d8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 09:26:13 -08:00 |
|
Brian Behlendorf
|
b58e34e0d8
|
Update makefiles
|
2008-12-22 09:22:39 -08:00 |
|
Brian Behlendorf
|
1ac6317bab
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 09:12:40 -08:00 |
|
Brian Behlendorf
|
e7f48402e0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 09:12:27 -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
|
b372f0554f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 17:03:19 -08:00 |
|
Brian Behlendorf
|
7afce80eb8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 17:02:56 -08:00 |
|
Brian Behlendorf
|
c8ad9946dc
|
use zlib
|
2008-12-19 16:58:20 -08:00 |
|
Brian Behlendorf
|
e8676f2c5f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:56:24 -08:00 |
|
Brian Behlendorf
|
2e8b703fff
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:56:03 -08:00 |
|
Brian Behlendorf
|
60289ccd8f
|
Add zfs_byteswap
|
2008-12-19 16:51:14 -08:00 |
|
Brian Behlendorf
|
3f0c49cfa4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:34:38 -08:00 |
|
Brian Behlendorf
|
cbc70456f1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:34:10 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
0debf57416
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:01:38 -08:00 |
|
Brian Behlendorf
|
081582b45a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:01:18 -08:00 |
|
Brian Behlendorf
|
fe8aa77a1b
|
Add AM_PROG_AS to configure
|
2008-12-19 15:47:14 -08:00 |
|
Brian Behlendorf
|
6f272feaa8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 13:48:05 -08:00 |
|
Brian Behlendorf
|
5cd3d5fe3f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 13:47:53 -08:00 |
|
Brian Behlendorf
|
1b2a1a31bb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 13:47:20 -08:00 |
|
Brian Behlendorf
|
b5e4bf3731
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 13:47:19 -08:00 |
|
Brian Behlendorf
|
f54b79e211
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 13:47:18 -08:00 |
|
Brian Behlendorf
|
8161b781a1
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 13:47:18 -08:00 |