Commit Graph

126 Commits

Author SHA1 Message Date
Brian Behlendorf 31f17baccc Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 16:33:55 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf f202e84f1a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 13:47:47 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf 776aad11dd Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 12:38:14 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00
Brian Behlendorf 87810a7c8b Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 12:37:13 -08:00
Brian Behlendorf 93a6c0b0b9 Fix c90 for() issue 2008-12-19 12:33:22 -08:00
Brian Behlendorf cd8c03b918 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 11:06:18 -08:00
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