Commit Graph

2441 Commits

Author SHA1 Message Date
Brian Behlendorf 6a509b3bca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:50:41 -08:00
Brian Behlendorf ccb0a865ab Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 3719c4146d Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 11:50:40 -08:00
Brian Behlendorf 77811f8236 Fix prototype 2008-12-17 11:48:40 -08:00
Brian Behlendorf 2286b6e77d Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-17 11:36:43 -08:00
Brian Behlendorf 5ea99efac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:36:20 -08:00
Brian Behlendorf bad0d9a316 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-17 11:36:19 -08:00
Brian Behlendorf 676ab35598 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:19 -08:00
Brian Behlendorf 0106dabb11 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-17 11:36:18 -08:00
Brian Behlendorf a681d70e28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:17 -08:00
Brian Behlendorf 5b9d98bf21 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf e532f6bef4 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf 8af904a4b0 Resolve index shadowing /usr/include/string.h:304 2008-12-17 11:34:19 -08:00
Brian Behlendorf ed9a35324d Not sure why Sun needed to remove these externs, but I need them back 2008-12-17 11:32:47 -08:00
Brian Behlendorf 0d92189fb6 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-17 11:27:44 -08:00
Brian Behlendorf 25db7e9413 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:27:21 -08:00
Brian Behlendorf 935fd6c681 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:27:20 -08:00
Brian Behlendorf d0e6950dd1 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 11:27:20 -08:00
Brian Behlendorf 55c8582174 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:27:19 -08:00
Brian Behlendorf dcf0fb9ffb Resolve shadow conflicts 2008-12-17 11:25:21 -08:00
Brian Behlendorf 8ce3344d62 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-17 11:17:39 -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 5914e6920f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-17 10:20:39 -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 60a0f2e5f8 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-17 10:20:14 -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 ef35fb0311 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-17 09:25:03 -08:00
Brian Behlendorf 640c2f8d7e Add missing includes to zfs cmd Makefile.am 2008-12-17 09:22:40 -08:00
Brian Behlendorf d896b48b63 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 16:57:34 -08:00
Brian Behlendorf 1e64eb4c07 Update makefiles for currently working tools 2008-12-16 16:51:23 -08:00
Brian Behlendorf 819f033e1b Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 16:35:22 -08:00
Brian Behlendorf 7453ec0f2c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:34:09 -08:00
Brian Behlendorf 8bed8da925 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:34:07 -08:00
Brian Behlendorf 1be9b2649d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 16:34:06 -08:00
Brian Behlendorf 2d7f255945 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 16:34:04 -08:00
Brian Behlendorf ebab24f633 Resolve shadow conflict 2008-12-16 16:26:50 -08:00
Brian Behlendorf 28303e5c31 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 16:20:33 -08:00
Brian Behlendorf f2bc2f7b6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:19:52 -08:00
Brian Behlendorf fd4da48000 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:19:50 -08:00
Brian Behlendorf e94598b0fd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 16:19:49 -08:00
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf 88d7e80fe2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 15:51:43 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e0a7138ef2 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00