]>
granicus.if.org Git - zfs/log
Brian Behlendorf [Tue, 9 Dec 2008 21:40:22 +0000 (13:40 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 21:40:22 +0000 (13:40 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 9 Dec 2008 21:40:21 +0000 (13:40 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 21:40:20 +0000 (13:40 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 9 Dec 2008 21:40:19 +0000 (13:40 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 21:40:19 +0000 (13:40 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 9 Dec 2008 21:40:16 +0000 (13:40 -0800)]
Resolve conflict
Brian Behlendorf [Tue, 9 Dec 2008 21:39:48 +0000 (13:39 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 9 Dec 2008 21:32:01 +0000 (13:32 -0800)]
Temporarily move taskq+util to libzpool until that directory is broken in to lib+module
Brian Behlendorf [Tue, 9 Dec 2008 00:46:38 +0000 (16:46 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:37 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 9 Dec 2008 00:46:35 +0000 (16:46 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:34 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 9 Dec 2008 00:46:32 +0000 (16:46 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:31 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 9 Dec 2008 00:46:29 +0000 (16:46 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:28 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Brian Behlendorf [Tue, 9 Dec 2008 00:46:26 +0000 (16:46 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:26 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 9 Dec 2008 00:46:24 +0000 (16:46 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:23 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 9 Dec 2008 00:46:20 +0000 (16:46 -0800)]
Merge branch 'fix-locks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:20 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-locks' into fix-locks
Brian Behlendorf [Tue, 9 Dec 2008 00:46:17 +0000 (16:46 -0800)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:16 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 9 Dec 2008 00:46:14 +0000 (16:46 -0800)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:14 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 9 Dec 2008 00:46:12 +0000 (16:46 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:11 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 9 Dec 2008 00:46:09 +0000 (16:46 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:08 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 9 Dec 2008 00:46:06 +0000 (16:46 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:05 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 9 Dec 2008 00:46:03 +0000 (16:46 -0800)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:46:02 +0000 (16:46 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 9 Dec 2008 00:38:46 +0000 (16:38 -0800)]
Minor tweak to update script
Brian Behlendorf [Tue, 9 Dec 2008 00:25:24 +0000 (16:25 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:23 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
Brian Behlendorf [Tue, 9 Dec 2008 00:25:21 +0000 (16:25 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:20 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Tue, 9 Dec 2008 00:25:18 +0000 (16:25 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:17 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Tue, 9 Dec 2008 00:25:15 +0000 (16:25 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:14 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Brian Behlendorf [Tue, 9 Dec 2008 00:25:12 +0000 (16:25 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:11 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Tue, 9 Dec 2008 00:25:09 +0000 (16:25 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:08 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Tue, 9 Dec 2008 00:25:06 +0000 (16:25 -0800)]
Merge branch 'fix-locks' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:05 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-locks' into fix-locks
Brian Behlendorf [Tue, 9 Dec 2008 00:25:03 +0000 (16:25 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Tue, 9 Dec 2008 00:25:03 +0000 (16:25 -0800)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:25:00 +0000 (16:25 -0800)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:24:59 +0000 (16:24 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Tue, 9 Dec 2008 00:24:57 +0000 (16:24 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:24:56 +0000 (16:24 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Tue, 9 Dec 2008 00:24:55 +0000 (16:24 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:24:54 +0000 (16:24 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Tue, 9 Dec 2008 00:24:52 +0000 (16:24 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:24:51 +0000 (16:24 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Tue, 9 Dec 2008 00:24:49 +0000 (16:24 -0800)]
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Brian Behlendorf [Tue, 9 Dec 2008 00:24:48 +0000 (16:24 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Tue, 9 Dec 2008 00:20:25 +0000 (16:20 -0800)]
Attempt move of kernel.c with topgit
Brian Behlendorf [Thu, 4 Dec 2008 00:56:53 +0000 (16:56 -0800)]
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:44 +0000 (16:56 -0800)]
Merge branch 'fix-stack' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:35 +0000 (16:56 -0800)]
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:28 +0000 (16:56 -0800)]
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:22 +0000 (16:56 -0800)]
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:21 +0000 (16:56 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
Brian Behlendorf [Thu, 4 Dec 2008 00:56:10 +0000 (16:56 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Thu, 4 Dec 2008 00:56:10 +0000 (16:56 -0800)]
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:01 +0000 (16:56 -0800)]
Merge branch 'fix-locks' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:56:00 +0000 (16:56 -0800)]
Merge commit 'refs/top-bases/fix-locks' into fix-locks
Brian Behlendorf [Thu, 4 Dec 2008 00:55:50 +0000 (16:55 -0800)]
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:55:49 +0000 (16:55 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Thu, 4 Dec 2008 00:55:41 +0000 (16:55 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Thu, 4 Dec 2008 00:55:41 +0000 (16:55 -0800)]
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:55:33 +0000 (16:55 -0800)]
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:55:32 +0000 (16:55 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Thu, 4 Dec 2008 00:55:23 +0000 (16:55 -0800)]
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:55:22 +0000 (16:55 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Thu, 4 Dec 2008 00:55:12 +0000 (16:55 -0800)]
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
Brian Behlendorf [Thu, 4 Dec 2008 00:55:11 +0000 (16:55 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Thu, 4 Dec 2008 00:47:10 +0000 (16:47 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Thu, 4 Dec 2008 00:28:35 +0000 (16:28 -0800)]
Refreshed patch for newer upstream context
Brian Behlendorf [Thu, 4 Dec 2008 00:19:11 +0000 (16:19 -0800)]
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Brian Behlendorf [Thu, 4 Dec 2008 00:18:50 +0000 (16:18 -0800)]
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Brian Behlendorf [Thu, 4 Dec 2008 00:18:02 +0000 (16:18 -0800)]
Refreshed fix-pthreads based on upstream changes
Brian Behlendorf [Wed, 3 Dec 2008 23:43:56 +0000 (15:43 -0800)]
Add userspace zfs_context file
Brian Behlendorf [Wed, 3 Dec 2008 21:31:00 +0000 (13:31 -0800)]
Update fix no zmod to handle context:
Brian Behlendorf [Wed, 3 Dec 2008 20:55:30 +0000 (12:55 -0800)]
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
Brian Behlendorf [Wed, 3 Dec 2008 20:54:50 +0000 (12:54 -0800)]
spa->spa_zio_cv dropped in upstream source, update fix-locks patch accordingly
Brian Behlendorf [Wed, 3 Dec 2008 20:51:06 +0000 (12:51 -0800)]
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
Brian Behlendorf [Wed, 3 Dec 2008 20:50:46 +0000 (12:50 -0800)]
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
Brian Behlendorf [Wed, 3 Dec 2008 20:50:24 +0000 (12:50 -0800)]
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
Brian Behlendorf [Wed, 3 Dec 2008 20:50:02 +0000 (12:50 -0800)]
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
Brian Behlendorf [Wed, 3 Dec 2008 20:49:26 +0000 (12:49 -0800)]
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
Brian Behlendorf [Wed, 3 Dec 2008 20:48:42 +0000 (12:48 -0800)]
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
Brian Behlendorf [Wed, 3 Dec 2008 20:09:06 +0000 (12:09 -0800)]
Rebase to OpenSolaris b103, in the process we are removing any code which did not originate from the OpenSolaris source. These changes will be reintroduced in topic branches for easier tracking
Brian Behlendorf [Tue, 2 Dec 2008 16:52:31 +0000 (08:52 -0800)]
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod