Commit Graph

1167 Commits

Author SHA1 Message Date
Brian Behlendorf b80664a1fb Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2008-12-11 11:26:37 -08:00
Brian Behlendorf 4dc7ff26b4 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2008-12-11 11:26:32 -08:00
Brian Behlendorf 632cbd733d Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2008-12-11 11:26:31 -08:00
Brian Behlendorf dd531d887a Merge branch 'fix-locks' into refs/top-bases/fix-branch 2008-12-11 11:26:26 -08:00
Brian Behlendorf f421307e1b Merge commit 'refs/top-bases/fix-locks' into fix-locks 2008-12-11 11:26:25 -08:00
Brian Behlendorf 4ceb3240cd Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2008-12-11 11:26:20 -08:00
Brian Behlendorf 3053990c38 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 11:26:19 -08:00
Brian Behlendorf dcf692f9b9 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2008-12-11 11:26:14 -08:00
Brian Behlendorf 6cc611850a Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2008-12-11 11:26:13 -08:00
Brian Behlendorf ad55539f56 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2008-12-11 11:26:08 -08:00
Brian Behlendorf 627daeca18 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2008-12-11 11:26:08 -08:00
Brian Behlendorf e363f54897 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2008-12-11 11:26:03 -08:00
Brian Behlendorf fc3c415441 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2008-12-11 11:26:02 -08:00
Brian Behlendorf d716efa009 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2008-12-11 11:25:57 -08:00
Brian Behlendorf 3f2453fea7 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2008-12-11 11:25:56 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf d00b912ed9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2008-12-11 11:25:48 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 11cf0f3f8c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-11 11:25:38 -08:00
Brian Behlendorf 650704aee3 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-11 11:25:35 -08:00
Brian Behlendorf 3f25e7cd69 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 11:25:34 -08:00
Brian Behlendorf 4cc662d833 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-11 11:25:29 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf fb35bdb6b6 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-11 11:25:23 -08:00
Brian Behlendorf ff282a978f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 11:25:22 -08:00
Brian Behlendorf bbfd8ed9e3 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-12-11 11:25:16 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 751eae9078 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-11 11:25:10 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf d409139b12 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-11 11:25:04 -08:00
Brian Behlendorf d390fb2a95 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-11 11:25:03 -08:00
Brian Behlendorf 4d6588043b Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-11 11:24:58 -08:00
Brian Behlendorf 3cb7c6035e Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-11 11:24:57 -08:00
Brian Behlendorf f321bfed24 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-11 11:24:52 -08:00
Brian Behlendorf b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -08:00
Brian Behlendorf b453b61272 Fix libspl move to the wrong place 2008-12-11 11:22:02 -08:00
Brian Behlendorf 4b7ee081ce Fix typo 2008-12-11 11:16:38 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
Brian Behlendorf 268ce9d611 Don't sweat zpool for now 2008-12-10 16:42:30 -08:00
Brian Behlendorf 962a43335f Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-10 13:31:21 -08:00
Brian Behlendorf 914669907b Change -lzport to -lspl 2008-12-10 13:29:14 -08:00
Brian Behlendorf 12a87a5416 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-10 12:54:38 -08:00
Brian Behlendorf ff70433ccb Strip umem related makefile, libumem now lives in the official upstream libumem portability library 2008-12-10 12:52:17 -08:00
Brian Behlendorf fbb34083f0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-10 12:46:18 -08:00
Brian Behlendorf 764d9b1916 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-10 12:46:15 -08:00
Brian Behlendorf e22f033653 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-10 12:46:14 -08:00
Brian Behlendorf f4fe97d169 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-10 12:46:13 -08:00