Commit Graph

1080 Commits

Author SHA1 Message Date
Brian Behlendorf 1ad6b1ec76 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-11 15:40:41 -08:00
Brian Behlendorf ef421a7c63 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-11 15:40:41 -08:00
Brian Behlendorf 690f91d041 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-11 15:40:40 -08:00
Brian Behlendorf 433a85a43c Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-11 15:40:40 -08:00
Brian Behlendorf 06535858db Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-11 15:40:39 -08:00
Brian Behlendorf 70227f55c1 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 15:40:38 -08:00
Brian Behlendorf 1ccd0b2b09 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 15:40:37 -08:00
Brian Behlendorf c2b5336408 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-11 15:40:37 -08:00
Brian Behlendorf 707baca025 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-11 15:40:36 -08:00
Brian Behlendorf d702c1b8c8 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2008-12-11 15:40:36 -08:00
Brian Behlendorf 2e610572b7 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-11 15:40:35 -08:00
Brian Behlendorf a7f9b0945b Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-11 15:40:34 -08:00
Brian Behlendorf 0e2a3e83d9 Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 15:40:33 -08:00
Brian Behlendorf 3deceede71 Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-11 15:40:33 -08:00
Brian Behlendorf aa42812a3d Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 15:40:32 -08:00
Brian Behlendorf 80d56586c1 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-11 15:40:32 -08:00
Brian Behlendorf a18d9673dd Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-11 15:40:31 -08:00
Brian Behlendorf bb9ec3c091 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-11 15:40:30 -08:00
Brian Behlendorf ef5ce462c5 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-11 15:40:29 -08:00
Brian Behlendorf 4ecb8e9965 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-11 15:40:29 -08:00
Brian Behlendorf 6ea07baffa Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 15:40:28 -08:00
Brian Behlendorf 61193e19f5 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-11 15:40:28 -08:00
Brian Behlendorf 5ca987d3bc Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-11 15:40:27 -08:00
Brian Behlendorf f81e0e700d Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-11 15:40:26 -08:00
Brian Behlendorf bb2221491c Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 15:40:25 -08:00
Brian Behlendorf 3751fd87e3 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 15:40:25 -08:00
Brian Behlendorf 57799b7b5a Resolve conflict 2008-12-11 15:40:14 -08:00
Brian Behlendorf 3399113552 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 15:39:25 -08:00
Brian Behlendorf 6b2c60acca Moving lib/libspl to linux-libspl branch 2008-12-11 15:38:59 -08:00
Brian Behlendorf 78d5afbca6 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 15:37:25 -08:00
Brian Behlendorf cf06f2f58f Whoops put these back 2008-12-11 15:34:32 -08:00
Brian Behlendorf 652388f3fb Moving all lib/libspl contexts to linux-libspl branch 2008-12-11 15:31:48 -08:00
Brian Behlendorf 2c028659ab Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 15:00:19 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf b6bcc8a256 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 14:26:53 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf 48187d122e Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:31 -08:00
Brian Behlendorf 18249cc808 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-11 14:25:30 -08:00
Brian Behlendorf f86c85c6a1 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 14:25:30 -08:00
Brian Behlendorf a98fdcc1b6 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-11 14:25:30 -08:00
Brian Behlendorf 4bc4fbeb38 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 14:25:29 -08:00
Brian Behlendorf 208f59182a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 14:25:28 -08:00
Brian Behlendorf b55f3f929f Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-11 14:25:26 -08:00
Brian Behlendorf e8da42db9b Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:26 -08:00
Brian Behlendorf d7a401b296 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2008-12-11 14:25:25 -08:00
Brian Behlendorf cb833127bd Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2008-12-11 14:25:25 -08:00
Brian Behlendorf e39748eff8 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-11 14:25:24 -08:00
Brian Behlendorf f1ab230869 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2008-12-11 14:25:23 -08:00
Brian Behlendorf 32a5a583a3 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 14:25:22 -08:00
Brian Behlendorf 6c062b10ae Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2008-12-11 14:25:22 -08:00