Commit Graph

2046 Commits

Author SHA1 Message Date
Brian Behlendorf 0dd5d4dae3 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-02-18 14:28:34 -08:00
Brian Behlendorf 224985aa70 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-02-18 14:28:34 -08:00
Brian Behlendorf e3f59d5034 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-02-18 14:28:31 -08:00
Brian Behlendorf d6e8154947 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-02-18 14:28:30 -08:00
Brian Behlendorf 145bd84478 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-02-18 14:28:28 -08:00
Brian Behlendorf 404fd8578f Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-02-18 14:28:27 -08:00
Brian Behlendorf a6fe6c5a73 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-02-18 14:28:24 -08:00
Brian Behlendorf d190a5b9bd Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-02-18 14:28:23 -08:00
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 68346c54fe Misnamed --load option sff changed to ssf 2009-02-13 12:07:34 -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 a06c9a3bd9 Add 2 more zpios test configurations 2009-02-06 15:08:15 -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 4bb45ceef2 Update zpios survey script to use new scripts 2009-02-06 14:58:31 -08:00
Brian Behlendorf 3c9fa95530 Add 2 new args for zpool_create to take extra args 2009-02-06 14:57:37 -08:00
Brian Behlendorf 1d0f2ef9e2 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-06 11:51:57 -08:00
Brian Behlendorf 97e40aae09 Add 8 basic x4550 configurations which are of interest. 2009-02-06 11:47:09 -08:00
Brian Behlendorf fefb0d97ea Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-05 15:23:00 -08:00
Brian Behlendorf 6c863d6aa1 Prep for zfs-0.4.2 tag 2009-02-05 15:19:27 -08:00
Brian Behlendorf 69f4668270 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-04 16:32:20 -08:00
Brian Behlendorf 83ed5b4c5d Update TODO 2009-02-04 16:25:09 -08:00
Brian Behlendorf 02862a5f7e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-03 10:03:26 -08:00
Brian Behlendorf 4365c44425 Properly detect and set HAVE_GPL_ONLY_SYMBOLS based on license 2009-02-03 09:59:54 -08:00
Brian Behlendorf 59008dc2b2 Updated script to actually make name 2009-02-03 09:28:19 -08:00
Brian Behlendorf ee61a7d32b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-26 22:11:03 -08:00
Brian Behlendorf 442ffc3574 Update bug assert in TODO 2009-01-26 22:07:34 -08:00