Commit Graph

460 Commits

Author SHA1 Message Date
Brian Behlendorf ac79d55dd1 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-10 12:45:55 -08:00
Brian Behlendorf bd750373a9 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-10 12:45:54 -08:00
Brian Behlendorf f6d6e6ec02 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-10 12:45:52 -08:00
Brian Behlendorf 6921187bfe Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-10 12:45:51 -08:00
Brian Behlendorf 0b7fd980f4 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-10 12:45:49 -08:00
Brian Behlendorf 374e693c48 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-10 12:45:48 -08:00
Brian Behlendorf 757841de5b Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-10 12:45:45 -08:00
Brian Behlendorf 68949a97b9 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-10 12:45:44 -08:00
Brian Behlendorf 0b2a6d04f7 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-10 12:45:41 -08:00
Brian Behlendorf aa79842875 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-10 12:45:40 -08:00
Brian Behlendorf 44ba72df88 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-10 12:45:38 -08:00
Brian Behlendorf bef0d6c0f7 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-10 12:45:37 -08:00
Brian Behlendorf b3ddd7dbbb Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-10 12:45:35 -08:00
Brian Behlendorf e27935e1fa Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-10 12:45:35 -08:00
Brian Behlendorf a63c8654c0 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-10 12:45:33 -08:00
Brian Behlendorf 68f43fe185 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-10 12:45:32 -08:00
Brian Behlendorf 97ee60ceff Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-10 12:45:30 -08:00
Brian Behlendorf 968ea539bc Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-10 12:45:29 -08:00
Brian Behlendorf 96cd1ebed4 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-10 12:45:26 -08:00
Brian Behlendorf c30141ac2e Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-10 12:45:25 -08:00
Brian Behlendorf cea3a92356 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-10 12:45:23 -08:00
Brian Behlendorf bbb1a0ebaf Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-10 12:45:22 -08:00
Brian Behlendorf 9e8b1e836c Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library 2008-12-10 12:43:20 -08:00
Brian Behlendorf abc04c23a5 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-09 14:16:33 -08:00
Brian Behlendorf 627f9a3296 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-09 14:16:33 -08:00
Brian Behlendorf cb0aaaa29c Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-09 14:16:32 -08:00
Brian Behlendorf fdefb041a7 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-09 14:16:31 -08:00
Brian Behlendorf 85d4ea4cb0 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-09 14:16:30 -08:00
Brian Behlendorf 3e74668176 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-09 14:16:30 -08:00
Brian Behlendorf a5c7500d30 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-09 14:16:29 -08:00
Brian Behlendorf 28a4cb140c Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-09 14:16:29 -08:00
Brian Behlendorf 9f57596c78 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-09 14:16:28 -08:00
Brian Behlendorf 4358d79285 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-09 14:16:27 -08:00
Brian Behlendorf d4b8a48f81 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-09 14:16:26 -08:00
Brian Behlendorf ad09e624d8 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-09 14:16:26 -08:00
Brian Behlendorf 10e68eee41 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-09 14:16:25 -08:00
Brian Behlendorf ed67495146 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-09 14:16:24 -08:00
Brian Behlendorf ac4e8d7252 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-09 14:16:23 -08:00
Brian Behlendorf e24c9ae6d4 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-09 14:16:23 -08:00
Brian Behlendorf 34fe60deca Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-09 14:16:22 -08:00
Brian Behlendorf 63f396db56 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-09 14:16:22 -08:00
Brian Behlendorf 954c00b5db Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-09 14:16:21 -08:00
Brian Behlendorf 13a9c19edc Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-09 14:16:20 -08:00
Brian Behlendorf f68f5df9f2 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-09 14:16:19 -08:00
Brian Behlendorf 5c300573f3 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-09 14:16:19 -08:00
Brian Behlendorf 91984f82e2 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-09 14:16:18 -08:00
Brian Behlendorf bad1b71540 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-09 14:16:17 -08:00
Brian Behlendorf 4f70aaec1a Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-09 14:16:16 -08:00
Brian Behlendorf 0649bd3be4 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-09 14:16:16 -08:00
Brian Behlendorf 5e97ed8493 Move vmem* to libumem 2008-12-09 14:14:00 -08:00