Commit Graph

589 Commits

Author SHA1 Message Date
Brian Behlendorf 3fa5220373 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 10:07:21 -08:00
Brian Behlendorf 5c7ee1347b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:06:01 -08:00
Brian Behlendorf 012ce813df Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 10:06:00 -08:00
Brian Behlendorf e4d1734eb1 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-18 10:05:59 -08:00
Brian Behlendorf 432399da0f Add dropping written variable declaration 2008-12-18 10:03:57 -08:00
Brian Behlendorf d7f107e21a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-18 09:06:39 -08:00
Brian Behlendorf 6b7c775e09 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 09:05:11 -08:00
Brian Behlendorf 06c9438f79 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 09:05:10 -08:00
Brian Behlendorf cfc42cf0ab Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 09:05:09 -08:00
Brian Behlendorf 0392342e3d Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-18 09:05:08 -08:00
Brian Behlendorf c37308fc20 Resolve stat conflict with stat() 2008-12-18 09:03:02 -08:00
Brian Behlendorf d1684019b4 Move int out of for construct for c90 compliance 2008-12-18 09:01:48 -08:00
Brian Behlendorf a836fda189 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 17:04:00 -08:00
Brian Behlendorf 53e66eef5a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 17:01:14 -08:00
Brian Behlendorf 6e26929ddf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 17:01:12 -08:00
Brian Behlendorf 420137d529 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 17:01:09 -08:00
Brian Behlendorf 194244b80b Resolve read shadow conflict 2008-12-17 16:57:21 -08:00
Brian Behlendorf 5a8894f159 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 13:11:55 -08:00
Brian Behlendorf 07411c1f84 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 13:10:39 -08:00
Brian Behlendorf 6ab9c098f1 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:10:39 -08:00
Brian Behlendorf 9842c708fa Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:10:38 -08:00
Brian Behlendorf 1e3aeaaef1 Resolve shadow conflict 2008-12-17 13:08:39 -08:00
Brian Behlendorf 7e6cf3d270 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 13:05:14 -08:00
Brian Behlendorf b5740d86cf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf b9fe30002e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 13:03:57 -08:00
Brian Behlendorf e41d37c49d Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 13:03:56 -08:00
Brian Behlendorf fafeacb53f Resolve shadow conflict 2008-12-17 13:01:56 -08:00
Brian Behlendorf f802338b3c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 12:48:12 -08:00
Brian Behlendorf 863ec76ff7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:45:53 -08:00
Brian Behlendorf 941e464645 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:45:52 -08:00
Brian Behlendorf a1b865abee Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 12:45:51 -08:00
Brian Behlendorf da718dd80a Resolve shadow conflict 2008-12-17 12:42:17 -08:00
Brian Behlendorf 1a50fc5480 Resolve collision 2008-12-17 12:40:17 -08:00
Brian Behlendorf 8cfc6c6ef3 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 12:29:38 -08:00
Brian Behlendorf 5fa2d90840 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 12:23:59 -08:00
Brian Behlendorf 9ef6211ce7 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 12:23:57 -08:00
Brian Behlendorf e2a977c404 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-17 12:23:55 -08:00
Brian Behlendorf b23299c7db Fix two prototypes in the right place 2008-12-17 12:20:20 -08:00
Brian Behlendorf 27ce147510 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-17 12:16:59 -08:00
Brian Behlendorf 385d51ad69 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:50:42 -08:00
Brian Behlendorf 6a509b3bca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:50:41 -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 2c028659ab Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 15:00:19 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf b6bcc8a256 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 14:26:53 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf f86c85c6a1 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 14:25:30 -08:00
Brian Behlendorf 4bc4fbeb38 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 14:25:29 -08:00
Brian Behlendorf 208f59182a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 14:25:28 -08:00
Brian Behlendorf f1ab230869 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-11 14:25:23 -08:00
Brian Behlendorf 32a5a583a3 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 14:25:22 -08:00
Brian Behlendorf b53201c0ca Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 14:25:16 -08:00
Brian Behlendorf 78b70a4471 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 14:25:10 -08:00
Brian Behlendorf 1e849d9b3b Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 14:25:08 -08:00
Brian Behlendorf 3f688a4bd8 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 14:25:07 -08:00
Brian Behlendorf b8294b1311 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:05 -08:00
Brian Behlendorf 0595328655 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 14:25:03 -08:00
Brian Behlendorf 022db7f816 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 14:25:01 -08:00
Brian Behlendorf ec2b4ef2ed Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 14:24:59 -08:00
Brian Behlendorf 9af6637db5 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 14:24:57 -08:00
Brian Behlendorf c325ac879c Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 14:24:56 -08:00
Brian Behlendorf 3e2988aa8b Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 14:24:50 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf 9b3c631dbd Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 14:24:48 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf a83549fbf3 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 14:05:38 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf de2d4da1a4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 11:37:26 -08:00
Brian Behlendorf e1694cfaec Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 11:27:18 -08:00
Brian Behlendorf 8aad84f781 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 11:27:12 -08:00
Brian Behlendorf e152d6e601 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 11:27:10 -08:00
Brian Behlendorf d50467b370 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-11 11:26:54 -08:00
Brian Behlendorf 206ceddde8 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 11:26:49 -08:00
Brian Behlendorf f421307e1b Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 11:26:25 -08:00
Brian Behlendorf fc3c415441 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 11:26:02 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf d00b912ed9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 11:25:48 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 3f25e7cd69 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 11:25:34 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf ff282a978f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 11:25:22 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00