Commit Graph

3643 Commits

Author SHA1 Message Date
Brian Behlendorf e20ba40c91 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-08-18 12:10:02 -07:00
Brian Behlendorf 12c361b1a1 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-08-18 12:09:58 -07:00
Brian Behlendorf f8cca2b295 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-08-18 12:09:57 -07:00
Brian Behlendorf 0911c7f7c3 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-08-18 12:09:53 -07:00
Brian Behlendorf 169f50db79 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-08-18 12:09:52 -07:00
Brian Behlendorf 0ec64690ba Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-08-18 12:09:47 -07:00
Brian Behlendorf abe9fefd9b Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-08-18 12:09:46 -07:00
Brian Behlendorf 3454bd3d24 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-08-18 12:09:42 -07:00
Brian Behlendorf e8791794b6 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-08-18 12:09:41 -07:00
Brian Behlendorf 3eadb69629 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-08-18 12:09:37 -07:00
Brian Behlendorf b3ea816a68 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-08-18 12:09:36 -07:00
Brian Behlendorf 170144c78f Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-08-18 12:09:32 -07:00
Brian Behlendorf b8667c4859 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-08-18 12:09:31 -07:00
Brian Behlendorf 1222979fd0 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-08-18 12:09:27 -07:00
Brian Behlendorf e7c05295ca Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-08-18 12:09:26 -07:00
Brian Behlendorf 78c9472f02 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-08-18 12:09:22 -07:00
Brian Behlendorf e7334931f1 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-08-18 12:09:21 -07:00
Brian Behlendorf 35402a2780 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-08-18 12:09:16 -07:00
Brian Behlendorf b330ab77df Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-08-18 12:09:14 -07:00
Brian Behlendorf d205b25a74 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-08-18 12:09:10 -07:00
Brian Behlendorf 25ddaec292 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-08-18 12:09:07 -07:00
Brian Behlendorf b99b422796 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 12:08:58 -07:00
Brian Behlendorf 88531ad82b Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-08-18 12:08:56 -07:00
Brian Behlendorf 9f5c891fb1 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-08-18 12:08:53 -07:00
Brian Behlendorf cadd2ec869 Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 2009-08-18 12:08:52 -07:00
Brian Behlendorf 1d7551423a Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-08-18 12:08:47 -07:00
Brian Behlendorf 41b297a27f Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2009-08-18 12:08:46 -07:00
Brian Behlendorf dc2aa83adf Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-08-18 12:08:41 -07:00
Brian Behlendorf abd8fdb94f Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:

	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
2009-08-18 12:08:36 -07:00
Brian Behlendorf 80785b829e Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-08-18 12:07:41 -07:00
Brian Behlendorf 9d2ca4a4d4 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2009-08-18 12:07:40 -07:00
Brian Behlendorf c0cef09b7e Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-08-18 12:07:35 -07:00
Brian Behlendorf db89339134 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Conflicts:

	module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
Brian Behlendorf b760445ff5 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-08-18 12:06:54 -07:00
Brian Behlendorf 3a37442dc7 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-08-18 12:06:53 -07:00
Brian Behlendorf 50d2c65daf Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-08-18 12:06:48 -07:00
Brian Behlendorf c5b5d32d69 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
Brian Behlendorf 268e04166d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-08-18 12:05:40 -07:00
Brian Behlendorf 481225606c Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-08-18 12:05:39 -07:00
Brian Behlendorf 387821c409 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-08-18 12:05:34 -07:00
Brian Behlendorf e95fcbffd9 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-08-18 12:05:33 -07:00
Brian Behlendorf ff0406ccc5 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-08-18 12:05:28 -07:00
Brian Behlendorf 38cc41b5fe Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-08-18 12:05:26 -07:00
Brian Behlendorf 4a4de1cc99 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-08-18 12:05:22 -07:00
Brian Behlendorf bb286fe763 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-08-18 12:05:20 -07:00
Brian Behlendorf 012cc31598 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-08-18 12:05:17 -07:00
Brian Behlendorf c3a6c4afba Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-08-18 12:05:13 -07:00
Brian Behlendorf 4b1b3d2498 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-08-18 12:05:09 -07:00
Brian Behlendorf 9e903015fd Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-08-18 12:05:07 -07:00
Brian Behlendorf e5e4fadc34 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/dmu.c
	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
	module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00