Commit Graph

1287 Commits

Author SHA1 Message Date
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 7bd9ab13e9 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 13:31:25 -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 cbb564f839 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 13:22:27 -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 f276d3eebc Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 13:19:26 -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 1cc99f79a3 New TopGit dependency: gcc-shadow 2008-12-16 13:19:25 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf a05ba90835 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 09:05:47 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf 336c8055c6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-15 16:55:57 -08:00
Brian Behlendorf cc420402bf Moving addition configure checks to m4 macros 2008-12-15 16:46:34 -08:00
Brian Behlendorf 682105e5a1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-15 16:37:02 -08:00
Brian Behlendorf 2712912cb8 Use old autoconf stratagy 2008-12-15 16:27:22 -08:00
Brian Behlendorf de445f95b2 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-15 10:46:16 -08:00
Brian Behlendorf 574e2cec0d Minor context change to ease merging 2008-12-15 10:41:15 -08:00
Brian Behlendorf 2bdf9cfae3 Moving all kernel+user configure magic to the correct topic branches where the features are introduced or needed 2008-12-15 10:40:22 -08:00
Brian Behlendorf b554219f17 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-15 10:31:21 -08:00
Brian Behlendorf e631cff898 Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this. 2008-12-15 10:28:14 -08:00
Brian Behlendorf 4380717fea Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 16:28:54 -08:00
Brian Behlendorf 0e8ac26fc9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 16:23:07 -08:00
Brian Behlendorf 08a8860091 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-12 16:23:04 -08:00
Brian Behlendorf acfdfe6ed7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-12 16:23:01 -08:00
Brian Behlendorf eee73dd80e Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 16:22:59 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf be0091aa60 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 15:07:50 -08:00
Brian Behlendorf d145044d80 Refresh Makefile 2008-12-12 15:04:48 -08:00
Brian Behlendorf df86df7535 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 14:57:27 -08:00
Brian Behlendorf f154348ca9 Update Makefile 2008-12-12 14:52:43 -08:00
Brian Behlendorf a12b0d1071 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 14:44:43 -08:00
Brian Behlendorf cf89e6e4b3 Refresh Makefile 2008-12-12 14:37:13 -08:00
Brian Behlendorf 6a28abb1d8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 14:30:01 -08:00
Brian Behlendorf 50532fe67b Refresh Makefile 2008-12-12 14:27:04 -08:00
Brian Behlendorf 2051c5740b Refresh Makefile 2008-12-12 14:26:14 -08:00
Brian Behlendorf a404fc40d4 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 14:21:38 -08:00
Brian Behlendorf 5a27f3f0a5 Comment out libzpool builds for now 2008-12-12 14:16:50 -08:00
Brian Behlendorf 4ad6161f1c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 14:02:15 -08:00
Brian Behlendorf 01db09fde5 Collapse libzcommon in to libzpool 2008-12-12 13:57:47 -08:00
Brian Behlendorf 65adeec4e2 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-12 13:48:07 -08:00
Brian Behlendorf de9d8a193f Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-12 13:46:57 -08:00
Brian Behlendorf 9ba40d2bfa Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 13:46:57 -08:00
Brian Behlendorf b37a410117 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-12 13:46:56 -08:00