Commit Graph

10297 Commits

Author SHA1 Message Date
Brian Behlendorf fc8954db24 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-02-18 13:12:48 -08:00
Brian Behlendorf 6d44b6b1da Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-02-18 13:12:45 -08:00
Brian Behlendorf 345705bdd4 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-02-18 13:12:44 -08:00
Brian Behlendorf f97b1ae20f Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-02-18 13:12:41 -08:00
Brian Behlendorf e7722c9f51 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-02-18 13:12:40 -08:00
Brian Behlendorf f19f346366 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 13:12:36 -08:00
Brian Behlendorf e203e7b48f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-02-18 13:12:35 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 6cb1ac2d49 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-13 12:19:24 -08:00
Brian Behlendorf 68346c54fe Misnamed --load option sff changed to ssf 2009-02-13 12:07:34 -08:00
Brian Behlendorf e47c3be7df Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-07 13:12:09 -08:00
Brian Behlendorf 4e4327a0a5 Drop the KERNEL portion of this check, just checking __i386 is correct 2009-02-07 13:10:16 -08:00
Brian Behlendorf b39cecb7eb Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-06 15:30:38 -08:00
Brian Behlendorf 9b649b23ef Minor update to ensure heads make it in to the log 2009-02-06 15:28:49 -08:00
Brian Behlendorf 9bec57ce0f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-06 15:10:41 -08:00
Brian Behlendorf a06c9a3bd9 Add 2 more zpios test configurations 2009-02-06 15:08:15 -08:00
Brian Behlendorf 727e61198e Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:52 -08:00
Brian Behlendorf fc05ac4d07 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-02-06 15:02:50 -08:00
Brian Behlendorf d9d27f55f2 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:47 -08:00
Brian Behlendorf 8c77add245 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-06 15:02:45 -08:00
Brian Behlendorf de0a4f92e0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:41 -08:00
Brian Behlendorf fe4806da94 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-02-06 15:02:40 -08:00
Brian Behlendorf 930280e3b3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:36 -08:00
Brian Behlendorf c5e364caa8 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-06 15:02:35 -08:00
Brian Behlendorf f8154e7251 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:31 -08:00
Brian Behlendorf 29b6072595 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-06 15:02:29 -08:00
Brian Behlendorf 4476705dc7 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:26 -08:00
Brian Behlendorf 0a7af02ae8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-06 15:02:24 -08:00
Brian Behlendorf 5596147778 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:20 -08:00
Brian Behlendorf 699ee2d085 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-06 15:02:19 -08:00
Brian Behlendorf d6a9c67613 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:15 -08:00
Brian Behlendorf 8ff44c302b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-02-06 15:02:14 -08:00
Brian Behlendorf e0aaa2dbbb Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:10 -08:00
Brian Behlendorf f4e873aff5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-06 15:02:08 -08:00
Brian Behlendorf 151d1d1c44 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-02-06 15:02:05 -08:00
Brian Behlendorf f47d073847 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-02-06 15:02:03 -08:00
Brian Behlendorf 89abf602ce Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-02-06 15:01:59 -08:00
Brian Behlendorf 470b989121 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-06 15:01:58 -08:00
Brian Behlendorf 2633eccc1d Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-02-06 15:01:54 -08:00
Brian Behlendorf e953a180b7 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-06 15:01:53 -08:00
Brian Behlendorf 7127264048 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-02-06 15:01:49 -08:00
Brian Behlendorf eb5e5a572f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-06 15:01:48 -08:00
Brian Behlendorf 377637c8ce Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-06 15:01:47 -08:00
Brian Behlendorf dd1f92d432 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-02-06 15:01:41 -08:00
Brian Behlendorf d77b0d6495 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-06 15:01:40 -08:00
Brian Behlendorf 0093c4d036 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-06 15:01:39 -08:00
Brian Behlendorf 027a9001d2 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-02-06 15:01:33 -08:00
Brian Behlendorf 737f1471d9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-06 15:01:31 -08:00