Brian Behlendorf
|
2cfbc50f40
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 16:02:47 -08:00 |
|
Brian Behlendorf
|
fe8aa77a1b
|
Add AM_PROG_AS to configure
|
2008-12-19 15:47:14 -08:00 |
|
Brian Behlendorf
|
e8eeffb167
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 13:48:36 -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
|
3579c5ac5a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 13:38:38 -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
|
e0457c6f15
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 12:39:43 -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
|
ee2e34a7a5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 12:10:50 -08:00 |
|
Brian Behlendorf
|
e485017676
|
Remove spa_boot from userspace build
|
2008-12-19 12:04:45 -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
|
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
|
45191d7904
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:51:26 -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
|
3e9b418237
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:37:48 -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 |
|
Brian Behlendorf
|
294ebb7537
|
Fix C90 for(int i;;;) compliance issues
|
2008-12-19 10:34:41 -08:00 |
|
Brian Behlendorf
|
06528b7d6e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:27:31 -08:00 |
|
Brian Behlendorf
|
e3815b6d3f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
e312737766
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
635d4e5e71
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
b66929fe90
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
5ee6377759
|
Fix missing void in prototype
|
2008-12-19 10:24:26 -08:00 |
|
Brian Behlendorf
|
726f45d53d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:19:42 -08:00 |
|
Brian Behlendorf
|
9de4108779
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
3e2e5c4535
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
88251643d7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
a68af79057
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
d4c39af7a6
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:52 -08:00 |
|
Brian Behlendorf
|
330840ff2e
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:27 -08:00 |
|
Brian Behlendorf
|
cd0966054f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 09:54:32 -08:00 |