Commit Graph

123 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 125e9815df Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 14:34:21 -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 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 7a7297d716 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 13:30:42 -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 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 bd30dc023f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 13:21:45 -08:00
Brian Behlendorf 60ad9afc28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf 5af8235e41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf f82621d7cb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:19:26 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf a3e5ad8d2f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 09:03:38 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf 1c238b277d Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-12 16:27:15 -08:00
Brian Behlendorf 0e8ac26fc9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 16:23:07 -08:00