Commit Graph

1302 Commits

Author SHA1 Message Date
Brian Behlendorf 4daafd6f1e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 12:39:21 -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 a12ef5400d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 12:37:14 -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 b660663ca7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 12:10:24 -08:00
Brian Behlendorf e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -08:00
Brian Behlendorf 390137732f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 11:06:56 -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 e8157d65b3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 11:05:48 -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 e79a0861ce Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:51:12 -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 7b00be4871 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 10:50:08 -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 dcd93a91a5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:37:35 -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 d9cd04fc35 Merge commit 'refs/top-bases/gcc-branch' into gcc-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 bc6d2fee28 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:27:18 -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 635d4e5e71 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 10:26:17 -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 9b02e8cb72 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:19:27 -08:00
Brian Behlendorf 9de4108779 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 3e2e5c4535 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 88251643d7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf 530b2e6564 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 09:54:15 -08:00
Brian Behlendorf 2d0ae2710c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 09:52:53 -08:00
Brian Behlendorf 5906903384 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 09:52:52 -08:00
Brian Behlendorf 23d1835844 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3d8832a795 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3bc48c3e74 Missing func readd 2008-12-19 09:50:15 -08:00
Brian Behlendorf 111303eeb8 context 2008-12-19 09:47:09 -08:00
Brian Behlendorf dbc567603d Readd removed hunk 2008-12-19 09:39:17 -08:00
Brian Behlendorf e160d4ae71 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 14:00:39 -08:00
Brian Behlendorf fa020b0f7e Remove -Wshadow for now 2008-12-18 13:57:27 -08:00
Brian Behlendorf 5b77a97eff Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 13:53:35 -08:00