Commit Graph

451 Commits

Author SHA1 Message Date
Brian Behlendorf 42e860b956 New TopGit dependency: fix-evict-dbufs 2008-12-03 16:55:38 -08:00
Brian Behlendorf 93353cff74 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-03 16:55:33 -08:00
Brian Behlendorf f4cbff30d7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-03 16:55:33 -08:00
Brian Behlendorf 6113c6468a Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-03 16:55:32 -08:00
Brian Behlendorf e51ffdc936 New TopGit dependency: fix-dsl_pool_t 2008-12-03 16:55:29 -08:00
Brian Behlendorf e90a8af413 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-03 16:55:24 -08:00
Brian Behlendorf 45293dbdd2 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-03 16:55:23 -08:00
Brian Behlendorf 9a5374658d Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-03 16:55:22 -08:00
Brian Behlendorf 9b72e0ffd6 New TopGit dependency: fix-dnode-cons 2008-12-03 16:55:19 -08:00
Brian Behlendorf a04163d698 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-03 16:55:13 -08:00
Brian Behlendorf 53b2172d24 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-03 16:55:12 -08:00
Brian Behlendorf b39f8cfa48 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-03 16:55:11 -08:00
Brian Behlendorf 7ea0d718bb New TopGit dependency: fix-dbuf_dirty_record_t 2008-12-03 16:55:08 -08:00
Brian Behlendorf 66375ad7e6 Refresh fix-branch 2008-12-03 16:54:55 -08:00
Brian Behlendorf 9348bfc021 New TopGit dependency: fix-dbuf_dirty_record_t 2008-12-03 16:53:24 -08:00
Brian Behlendorf 1ee3e2c2b7 Recreate fix-branch after rebase 2008-12-03 16:53:08 -08:00
Brian Behlendorf c48cf16fe6 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-03 16:47:10 -08:00
Brian Behlendorf d04d66d1c7 Refreshed patch for newer upstream context 2008-12-03 16:28:35 -08:00
Brian Behlendorf f3ee1c7591 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-03 16:19:11 -08:00
Brian Behlendorf c05d222824 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-03 16:18:50 -08:00
Brian Behlendorf 7bc74ea3c7 Refreshed fix-pthreads based on upstream changes 2008-12-03 16:18:02 -08:00
Brian Behlendorf 1af743d8da Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-03 15:44:12 -08:00
Brian Behlendorf 65b9b505cf Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-03 15:44:11 -08:00
Brian Behlendorf 31e7ba5593 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-03 15:44:11 -08:00
Brian Behlendorf 0cf4e1006a Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-03 15:44:10 -08:00
Brian Behlendorf 4d579da99f Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-03 15:44:10 -08:00
Brian Behlendorf 96072c88e2 Add userspace zfs_context file 2008-12-03 15:43:56 -08:00
Brian Behlendorf 25a6bc4ffd Update fix no zmod to handle context: 2008-12-03 13:31:00 -08:00
Brian Behlendorf abfcf9e532 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-03 12:55:30 -08:00
Brian Behlendorf b981a3ab4b spa->spa_zio_cv dropped in upstream source, update fix-locks patch accordingly 2008-12-03 12:54:50 -08:00
Brian Behlendorf 3d58032e16 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-03 12:51:06 -08:00
Brian Behlendorf e5db6312c8 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-03 12:50:46 -08:00
Brian Behlendorf 4ad630c929 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-03 12:50:24 -08:00
Brian Behlendorf 20e50e3a5e Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-03 12:50:02 -08:00
Brian Behlendorf afe9e56ab0 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-03 12:49:26 -08:00
Brian Behlendorf 4acf46e211 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-03 12:48:42 -08:00
Brian Behlendorf 2614a847b3 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-03 12:47:55 -08:00
Brian Behlendorf a0d3a74d7f Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-03 12:47:54 -08:00
Brian Behlendorf 04cd3d24f9 New TopGit dependency: feature-zap-cursor-to-key 2008-12-03 12:47:52 -08:00
Brian Behlendorf e24f5be337 Recreate feature-branch to simply feature merge 2008-12-03 12:47:38 -08:00
Brian Behlendorf 97aace11b3 Refresh feature-commit-cb to handle new context 2008-12-03 12:38:46 -08:00
Brian Behlendorf 5f10755521 Refreshed feature-zap-cursor-to-key to handle new context 2008-12-03 12:25:47 -08:00
Brian Behlendorf b128c09fbe 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 2008-12-03 12:09:06 -08:00
Brian Behlendorf be1242a56a Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-02 08:53:29 -08:00
Brian Behlendorf 33d4944e4d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-02 08:53:18 -08:00
Brian Behlendorf 264f09c323 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-02 08:53:13 -08:00
Brian Behlendorf 22bf771aab Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-02 08:52:54 -08:00
Brian Behlendorf 56301526c2 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-02 08:52:43 -08:00
Brian Behlendorf a1af337250 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-02 08:52:31 -08:00
Brian Behlendorf 82528f38ae Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-02 08:52:25 -08:00