Commit Graph

1777 Commits

Author SHA1 Message Date
Brian Behlendorf 7827c5b51e Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-17 11:27:26 -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 482758ca0f Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-17 11:17:21 -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 c7dd574d82 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-17 10:20:21 -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 d54c215cc6 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-17 09:24:46 -08:00
Brian Behlendorf 640c2f8d7e Add missing includes to zfs cmd Makefile.am 2008-12-17 09:22:40 -08:00
Brian Behlendorf cbdfacef47 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 16:57:04 -08:00
Brian Behlendorf 1e64eb4c07 Update makefiles for currently working tools 2008-12-16 16:51:23 -08:00
Brian Behlendorf 087a95625d Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 16:34:28 -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 4a471a8e5c Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 16:20:03 -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 8be6dc411d Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 15:51:26 -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
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf f6faaef095 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 14:34:04 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf fb3d1c555a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 2a93706084 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 13:30:26 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf 34b937c016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf e46311c1e0 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf f693a600d0 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf 206a3ac58c Resolve 2 more shadow conflicts 2008-12-16 13:28:23 -08:00
Brian Behlendorf a29d93cf8e Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 13:21:29 -08:00