Commit Graph

137 Commits

Author SHA1 Message Date
Brian Behlendorf 09f348197e Resolve conflict 2008-12-12 14:00:32 -08:00
Brian Behlendorf 01db09fde5 Collapse libzcommon in to libzpool 2008-12-12 13:57:47 -08:00
Brian Behlendorf 60a8ec8eeb Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 13:52:47 -08:00
Brian Behlendorf a4fce46af9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 13:52:44 -08:00
Brian Behlendorf d5c06eeec8 Revert mutex changes 2008-12-12 13:50:45 -08:00
Brian Behlendorf f7e63c25ea Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 13:40:17 -08:00
Brian Behlendorf 058cbf020f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 13:40:15 -08:00
Brian Behlendorf de9d49a2b4 Minor mutex tweaks 2008-12-12 13:38:13 -08:00
Brian Behlendorf ffdd3b21d2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 12:57:20 -08:00
Brian Behlendorf ba611ca42d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 12:57:18 -08:00
Brian Behlendorf b127f72a15 Resolve mutex conflict 2008-12-12 12:55:33 -08:00
Brian Behlendorf 52de958498 Refresh autogen products 2008-12-12 12:17:51 -08:00
Brian Behlendorf 42c94f3b60 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 12:16:50 -08:00
Brian Behlendorf 4d2cd6e70a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 12:13:50 -08:00
Brian Behlendorf ac9f5a5af0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 12:13:43 -08:00
Brian Behlendorf 0f99484285 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-12 12:13:41 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf 7297c6d959 Refresh autogen products 2008-12-12 10:31:54 -08:00
Brian Behlendorf 609680b177 Refresh autogen products 2008-12-12 10:20:55 -08:00
Brian Behlendorf 3b4adb0abd Add all autogen products 2008-12-12 09:25:06 -08:00
Brian Behlendorf c1a800e4c5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:19 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf a5ea185d73 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-11 16:35:33 -08:00
Brian Behlendorf 9eb741a1fe Readd missing header 2008-12-11 16:23:35 -08:00
Brian Behlendorf be5e4ee04f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 15:00:50 -08:00
Brian Behlendorf a3c66a6b89 Resolve conflict 2008-12-11 14:58:34 -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 8b20091dda Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 11:47:54 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf f07f82e93a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 11:26:43 -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 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -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 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -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