Commit Graph

451 Commits

Author SHA1 Message Date
Brian Behlendorf d5295e451f Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-02 08:52:22 -08:00
Brian Behlendorf 6fd279437d Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-02 08:52:19 -08:00
Brian Behlendorf 75898ec634 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-02 08:52:15 -08:00
Brian Behlendorf 98edc51a2b Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-02 08:52:09 -08:00
Brian Behlendorf ac510492da Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-02 08:52:06 -08:00
Brian Behlendorf 16d980efb4 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-02 08:52:03 -08:00
Brian Behlendorf 12d6a5b7dc Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-02 08:52:00 -08:00
Brian Behlendorf a5c8544c51 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-02 08:51:57 -08:00
Brian Behlendorf 1977158193 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-02 08:51:54 -08:00
Brian Behlendorf dd09dedb8b Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-02 08:51:43 -08:00
Brian Behlendorf 8aa0cb97b5 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-02 08:51:40 -08:00
Brian Behlendorf b6097ae55a Remove stray stub kernel files which should be brought in my linux-kernel-module patch 2008-12-02 08:47:21 -08:00
Brian Behlendorf 9ac0ad5671 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-01 16:18:09 -08:00
Brian Behlendorf 3a0c78f00a Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-01 16:17:56 -08:00
Brian Behlendorf 3f0b1cf687 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-01 16:17:50 -08:00
Brian Behlendorf 230f6c9223 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-01 16:17:22 -08:00
Brian Behlendorf 15003316a0 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-01 16:17:08 -08:00
Brian Behlendorf 4464244677 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-01 16:16:53 -08:00
Brian Behlendorf 68760ef209 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-01 16:16:46 -08:00
Brian Behlendorf 7d9abfa754 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-01 16:16:43 -08:00
Brian Behlendorf 60ca0f5b90 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-01 16:16:40 -08:00
Brian Behlendorf 761eedf029 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-01 16:16:37 -08:00
Brian Behlendorf 64abe5d8f1 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-01 16:16:29 -08:00
Brian Behlendorf 87a62ac3e4 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-01 16:16:25 -08:00
Brian Behlendorf 3aad9321bc Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-01 16:16:22 -08:00
Brian Behlendorf 9875431a9f Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-01 16:16:18 -08:00
Brian Behlendorf 0d8d373bc4 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-01 16:16:14 -08:00
Brian Behlendorf c7310e8f0e Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-01 16:16:09 -08:00
Brian Behlendorf ff8c81a61f Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-01 16:15:58 -08:00
Brian Behlendorf 2285428ba2 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-01 16:15:53 -08:00
Brian Behlendorf 7ebbc0c799 Finish removing all non-upstream bits from master 2008-12-01 16:15:29 -08:00
Brian Behlendorf f0f8b2ccce Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-01 15:56:54 -08:00
Brian Behlendorf bb6257d0fa Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-01 15:56:47 -08:00
Brian Behlendorf 3d325597ff Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-01 15:56:43 -08:00
Brian Behlendorf 2e8d0c4cd2 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-01 15:56:30 -08:00
Brian Behlendorf 2664929dc3 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-01 15:56:23 -08:00
Brian Behlendorf 63c49fa982 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-01 15:56:16 -08:00
Brian Behlendorf 4a805e2768 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-01 15:56:12 -08:00
Brian Behlendorf 9a90adb9bb Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-01 15:56:10 -08:00
Brian Behlendorf 95f9285e2f Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-01 15:56:08 -08:00
Brian Behlendorf f65b548331 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-01 15:56:06 -08:00
Brian Behlendorf 68aef0aea9 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-01 15:56:02 -08:00
Brian Behlendorf e8610745f3 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-01 15:55:59 -08:00
Brian Behlendorf e24dd552fb Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-01 15:55:57 -08:00
Brian Behlendorf 551b8c5839 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-01 15:55:55 -08:00
Brian Behlendorf 3b5b736ba5 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-01 15:55:53 -08:00
Brian Behlendorf 24fca97809 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-01 15:55:50 -08:00
Brian Behlendorf 8b7791678f Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-01 15:55:44 -08:00
Brian Behlendorf 3179dae49d Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-01 15:55:42 -08:00
Brian Behlendorf ef76e2f5ea Removed build system from master branch, will relocate to linux-zfs-branch 2008-12-01 15:41:33 -08:00