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
|
d8c6c982e6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 09:27:37 -08:00 |
|
Brian Behlendorf
|
b58e34e0d8
|
Update makefiles
|
2008-12-22 09:22:39 -08:00 |
|
Brian Behlendorf
|
7577be2acd
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 09:13: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
|
b4b2f9061c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 17:04:53 -08:00 |
|
Brian Behlendorf
|
c8ad9946dc
|
use zlib
|
2008-12-19 16:58:20 -08:00 |
|
Brian Behlendorf
|
9ce20e962a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 16:57:50 -08:00 |
|
Brian Behlendorf
|
60289ccd8f
|
Add zfs_byteswap
|
2008-12-19 16:51:14 -08:00 |
|
Brian Behlendorf
|
a89736c72e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 16:36:09 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
5b205b781d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 16:03:12 -08:00 |
|
Brian Behlendorf
|
fe8aa77a1b
|
Add AM_PROG_AS to configure
|
2008-12-19 15:47:14 -08:00 |
|
Brian Behlendorf
|
37d2a76f6d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 13:48:49 -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 |
|
Brian Behlendorf
|
89bd2100e7
|
Resolve a few more c90 issues
|
2008-12-19 13:45:24 -08:00 |
|
Brian Behlendorf
|
1f2ec6b6cd
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 13:38:51 -08:00 |
|
Brian Behlendorf
|
8ab575cd8e
|
Remove vdev_disk.c from userspace build, we simply use vdev_file.c here
|
2008-12-19 13:35:29 -08:00 |
|
Brian Behlendorf
|
2b800ba091
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 12:40:07 -08:00 |
|
Brian Behlendorf
|
97818e5e2b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 12:37:17 -08:00 |
|
Brian Behlendorf
|
459f1388ba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 12:37:15 -08:00 |
|
Brian Behlendorf
|
a12ef5400d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 12:37:14 -08:00 |
|
Brian Behlendorf
|
87810a7c8b
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 12:37:13 -08:00 |
|
Brian Behlendorf
|
93a6c0b0b9
|
Fix c90 for() issue
|
2008-12-19 12:33:22 -08:00 |
|
Brian Behlendorf
|
3c787f200f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 12:11:19 -08:00 |
|
Brian Behlendorf
|
e485017676
|
Remove spa_boot from userspace build
|
2008-12-19 12:04:45 -08:00 |
|
Brian Behlendorf
|
5fb6644efc
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 11:07:23 -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
|
e8157d65b3
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 11:05:48 -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
|
849bcf1672
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 10:51:39 -08:00 |
|
Brian Behlendorf
|
1db27e736e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
ead0ea6da5
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
7b00be4871
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
d9b08ad01f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
66e0d59024
|
Whoops, add missing j
|
2008-12-19 10:48:11 -08:00 |
|
Brian Behlendorf
|
e4a2a83b42
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 10:38:00 -08:00 |
|
Brian Behlendorf
|
76247cc21d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:36:34 -08:00 |
|
Brian Behlendorf
|
800463b2ef
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
d9cd04fc35
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
7e159c86a3
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:36:32 -08:00 |