Commit Graph

397 Commits

Author SHA1 Message Date
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf 893a49fa9a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 9041f66bad Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
Brian Behlendorf 7ea483ad86 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 10:50:35 -08:00
Brian Behlendorf 1db27e736e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:50:09 -08:00
Brian Behlendorf ead0ea6da5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:50:09 -08:00
Brian Behlendorf d9b08ad01f Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:50:08 -08:00
Brian Behlendorf 66e0d59024 Whoops, add missing j 2008-12-19 10:48:11 -08:00
Brian Behlendorf 809a867d29 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 10:37:00 -08:00
Brian Behlendorf 76247cc21d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:36:34 -08:00
Brian Behlendorf 800463b2ef Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:36:33 -08:00
Brian Behlendorf 7e159c86a3 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:36:32 -08:00
Brian Behlendorf 294ebb7537 Fix C90 for(int i;;;) compliance issues 2008-12-19 10:34:41 -08:00
Brian Behlendorf cfacff5b49 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 10:26:44 -08:00
Brian Behlendorf e3815b6d3f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:26:18 -08:00
Brian Behlendorf e312737766 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:26:18 -08:00
Brian Behlendorf b66929fe90 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-19 10:26:17 -08:00
Brian Behlendorf 5ee6377759 Fix missing void in prototype 2008-12-19 10:24:26 -08:00
Brian Behlendorf 2724501c9c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 13:52:52 -08:00
Brian Behlendorf 433b5c8023 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:52:17 -08:00
Brian Behlendorf 93bc33a39e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:52:16 -08:00
Brian Behlendorf 23e30eeec9 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:52:15 -08:00
Brian Behlendorf 6cccf01d35 Missed needed drc var 2008-12-18 13:50:12 -08:00
Brian Behlendorf faa5fba441 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 13:43:51 -08:00
Brian Behlendorf bab7f42832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:43:20 -08:00
Brian Behlendorf 5ce7826ab4 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 732fe6a75f Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 973a9d5a79 Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway 2008-12-18 13:41:21 -08:00
Brian Behlendorf 6139a7f023 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 13:27:07 -08:00
Brian Behlendorf 1a6091791d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:26:36 -08:00
Brian Behlendorf 8f52e45adf Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:26:35 -08:00
Brian Behlendorf 8eccbd95b9 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:26:34 -08:00
Brian Behlendorf 163f096cb6 Resolve remove shadow, rename to rm 2008-12-18 13:24:37 -08:00
Brian Behlendorf 3cc05d15f3 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 11:51:56 -08:00
Brian Behlendorf 4be8cdca38 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:51:24 -08:00
Brian Behlendorf cf4b3895f1 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 11:51:23 -08:00
Brian Behlendorf 458a2444c2 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 11:51:22 -08:00
Brian Behlendorf d957a6c66f Resolve dnp shadow conflict 2008-12-18 11:49:22 -08:00
Brian Behlendorf e43153f247 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 11:38:15 -08:00
Brian Behlendorf 58645698b4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:34:26 -08:00
Brian Behlendorf 9ae2c70438 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 11:34:25 -08:00
Brian Behlendorf 625fac6664 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-18 11:34:24 -08:00
Brian Behlendorf 63bf9b60d5 Revert changes from this branch so the branch may be removed. We
will integrate the latest patch from Sun here once everything is
is basically working.  This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
Brian Behlendorf 1467b3ec61 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 11:25:13 -08:00
Brian Behlendorf 2ef6ae9654 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 11:24:42 -08:00
Brian Behlendorf d431498139 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 11:24:41 -08:00
Brian Behlendorf 22f122e505 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 11:24:40 -08:00
Brian Behlendorf 50b70a0c9a Resolve time conflict 2008-12-18 11:22:39 -08:00
Brian Behlendorf 15418e802e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 10:06:31 -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 fe1bd17be7 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-18 09:05:49 -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 3d5bf779a3 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-17 17:02:18 -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 55b0194547 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-17 12:26:44 -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 9a10c42b65 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-17 11:52:50 -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 f46d4ce0a4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:59:32 -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 4003bc5b2c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 11:35:48 -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 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