Commit Graph

2511 Commits

Author SHA1 Message Date
Brian Behlendorf 5ae92c2a3c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:48:00 -08:00
Brian Behlendorf 5cd3d5fe3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:47:53 -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 f54b79e211 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 13:47:18 -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 fc45f65ed8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:38:02 -08:00
Brian Behlendorf 4679c1631c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:37:55 -08:00
Brian Behlendorf 8ab575cd8e Remove vdev_disk.c from userspace build, we simply use vdev_file.c here 2008-12-19 13:35:29 -08:00
Brian Behlendorf f53179120a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:38:39 -08:00
Brian Behlendorf 5f5a7707b5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -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 0610e0e40b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:09:37 -08:00
Brian Behlendorf 8e9ab16b20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:09:23 -08:00
Brian Behlendorf e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -08:00
Brian Behlendorf f9e908db67 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 11:06:32 -08:00
Brian Behlendorf e5a6ed971b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -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 25585a1884 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:50:49 -08:00
Brian Behlendorf 4f5a560334 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:50:42 -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 fd01bfe6b1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:37:13 -08:00
Brian Behlendorf 01f8dc1f20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:37:06 -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 4ee870c380 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:26:57 -08:00
Brian Behlendorf f1ba2464f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:26:50 -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 753b745668 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 10:19:01 -08:00
Brian Behlendorf a577858f33 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:18:53 -08:00