Commit Graph

1028 Commits

Author SHA1 Message Date
Brian Behlendorf cd24f8b154 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-09 14:16:01 -08:00
Brian Behlendorf fff6686328 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-09 14:16:01 -08:00
Brian Behlendorf 1897a51dc7 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-09 14:16:00 -08:00
Brian Behlendorf 99028a91ec Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-09 14:15:59 -08:00
Brian Behlendorf 98c1df5b37 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-09 14:15:58 -08:00
Brian Behlendorf e3afcb6227 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-09 14:15:57 -08:00
Brian Behlendorf 5e97ed8493 Move vmem* to libumem 2008-12-09 14:14:00 -08:00
Brian Behlendorf ac3b294e3b Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-09 13:58:23 -08:00
Brian Behlendorf e6d87a20b1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 13:58:22 -08:00
Brian Behlendorf 03454ab344 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 13:58:15 -08:00
Brian Behlendorf 1654a48217 Build system update 2008-12-09 13:46:53 -08:00
Brian Behlendorf cae724a895 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-09 13:42:46 -08:00
Brian Behlendorf 73fdb26fde Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-09 13:42:45 -08:00
Brian Behlendorf 1bc99e3fa0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-09 13:42:38 -08:00
Brian Behlendorf cc5274f04e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 13:41:02 -08:00
Brian Behlendorf 65849deb31 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-09 13:41:01 -08:00
Brian Behlendorf c909deb811 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-09 13:41:01 -08:00
Brian Behlendorf 9936555889 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-09 13:41:00 -08:00
Brian Behlendorf 941a7bf937 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-09 13:41:00 -08:00
Brian Behlendorf e727920ebd Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-09 13:40:59 -08:00
Brian Behlendorf 2a048e0dce Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-09 13:40:59 -08:00
Brian Behlendorf e31fa9cc3c Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-09 13:40:57 -08:00
Brian Behlendorf 854bdb3f8b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-09 13:40:56 -08:00
Brian Behlendorf 234b2feb58 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-09 13:40:56 -08:00
Brian Behlendorf 69ff734e85 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-09 13:40:55 -08:00
Brian Behlendorf 538286725a Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-09 13:40:54 -08:00
Brian Behlendorf 167dda7135 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-09 13:40:54 -08:00
Brian Behlendorf 0625326f01 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-09 13:40:52 -08:00
Brian Behlendorf 4a591c4d96 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-09 13:40:52 -08:00
Brian Behlendorf a2c9c7be19 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-09 13:40:51 -08:00
Brian Behlendorf e05f515963 Resolve conflict 2008-12-09 13:40:46 -08:00
Brian Behlendorf e57a89a976 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-09 13:40:31 -08:00
Brian Behlendorf c10b31a68b Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-09 13:40:30 -08:00
Brian Behlendorf b6d2574ac1 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-09 13:40:29 -08:00
Brian Behlendorf 01f1bec069 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-09 13:40:28 -08:00
Brian Behlendorf a2763bcded Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-09 13:40:27 -08:00
Brian Behlendorf 36ef356495 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-09 13:40:27 -08:00
Brian Behlendorf 26fdb4d7d3 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-09 13:40:26 -08:00
Brian Behlendorf 86e7b96fdb Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-09 13:40:25 -08:00
Brian Behlendorf 75ccf8837b Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-09 13:40:24 -08:00
Brian Behlendorf ac5ce2b419 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-09 13:40:23 -08:00
Brian Behlendorf 87bd256733 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-09 13:40:22 -08:00
Brian Behlendorf 57972948ca Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-09 13:40:22 -08:00
Brian Behlendorf a27793f61f Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-09 13:40:21 -08:00
Brian Behlendorf f32483a64b Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-09 13:40:20 -08:00
Brian Behlendorf 5b2905712c Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-09 13:40:19 -08:00
Brian Behlendorf 079d7a40e7 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-09 13:40:19 -08:00
Brian Behlendorf 5e1552c432 Resolve conflict 2008-12-09 13:40:16 -08:00
Brian Behlendorf f92e1c2a34 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-09 13:39:48 -08:00
Brian Behlendorf 8f660a1384 Resolve conflict 2008-12-09 13:39:42 -08:00