Commit Graph

11925 Commits

Author SHA1 Message Date
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf 3ac1fca8dc Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-02-18 14:27:31 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf 9d88c314ef Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 14:04:10 -08:00
Brian Behlendorf eb387a3281 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-02-18 14:04:09 -08:00
Brian Behlendorf 3eb7fa9afd Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-02-18 14:04:08 -08:00
Brian Behlendorf c694a929cf Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-02-18 14:04:05 -08:00
Brian Behlendorf 32d4d74b04 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-02-18 14:04:04 -08:00
Brian Behlendorf 6fa66816c1 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 14:03:55 -08:00
Brian Behlendorf 5be9e325a1 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf 9a160959b6 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-02-18 13:12:59 -08:00
Brian Behlendorf ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -08:00
Brian Behlendorf b0c6d9452e Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-02-18 13:12:55 -08:00
Brian Behlendorf 0b8e48b813 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-02-18 13:12:53 -08:00
Brian Behlendorf f499f3e5f4 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-02-18 13:12:49 -08:00
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 2b9aadcaf2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-13 12:19:30 -08:00
Brian Behlendorf c5f1eef931 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-13 12:19:27 -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 ca51e5a20d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-07 13:12:10 -08:00
Brian Behlendorf 37697f89c4 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-07 13:12:09 -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 7f38c76b46 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-06 15:30:40 -08:00
Brian Behlendorf 0569ac96a4 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-06 15:30:39 -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 31ea8d7dac Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-06 15:10:43 -08:00
Brian Behlendorf 09485911ca Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-06 15:10:41 -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 4c927e213a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-06 15:02:54 -08:00
Brian Behlendorf bd1024ffc4 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-06 15:02:53 -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