Commit Graph

1630 Commits

Author SHA1 Message Date
Brian Behlendorf e4addd4618 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 13:22:31 -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 b62b556896 Moving unused hunk to unused patch 2008-12-16 10:11:41 -08:00
Brian Behlendorf 4f488ec6e4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 09:06:01 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf 6b4a70c477 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-15 16:56:07 -08:00
Brian Behlendorf cc420402bf Moving addition configure checks to m4 macros 2008-12-15 16:46:34 -08:00
Brian Behlendorf accc1cd03f Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-15 16:37:12 -08:00
Brian Behlendorf 2712912cb8 Use old autoconf stratagy 2008-12-15 16:27:22 -08:00
Brian Behlendorf 10a221262d Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-15 10:46:21 -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 8b125c7e0a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-15 10:31:26 -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 579f6e603f Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG 2008-12-15 09:29:26 -08:00
Brian Behlendorf 5ba09de7b5 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 16:29:01 -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 f04a16b1e3 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 15:08:13 -08:00
Brian Behlendorf d145044d80 Refresh Makefile 2008-12-12 15:04:48 -08:00
Brian Behlendorf b694f3fbc5 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 14:57:32 -08:00
Brian Behlendorf f154348ca9 Update Makefile 2008-12-12 14:52:43 -08:00
Brian Behlendorf 101f25ad24 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 14:44:47 -08:00
Brian Behlendorf cf89e6e4b3 Refresh Makefile 2008-12-12 14:37:13 -08:00
Brian Behlendorf 437092574a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 14:30:06 -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 611af8dcda Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 14:21:43 -08:00
Brian Behlendorf 5a27f3f0a5 Comment out libzpool builds for now 2008-12-12 14:16:50 -08:00
Brian Behlendorf 1f7220674a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 14:02:19 -08:00
Brian Behlendorf 01db09fde5 Collapse libzcommon in to libzpool 2008-12-12 13:57:47 -08:00
Brian Behlendorf ed8f3ccefb Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-12 13:48:11 -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 6f3a9cb131 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-12 13:46:56 -08:00
Brian Behlendorf b37a410117 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-12 13:46:56 -08:00
Brian Behlendorf 6da8e28ab6 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-12 13:46:56 -08:00
Brian Behlendorf 2ffe84f024 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-12 13:46:55 -08:00
Brian Behlendorf 240084a033 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-12 13:46:54 -08:00
Brian Behlendorf a9e9f0cd45 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-12 13:46:53 -08:00
Brian Behlendorf abea56a45f Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-12 13:46:52 -08:00
Brian Behlendorf 053bd1203d Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-12 13:46:52 -08:00