Commit Graph

219 Commits

Author SHA1 Message Date
Brian Behlendorf 457fab8a49 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-09 14:25:39 -08:00
Brian Behlendorf 7489df5960 Refresh Makefiles for new files 2008-12-09 14:23:45 -08:00
Brian Behlendorf b569329a77 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-09 14:16:42 -08:00
Brian Behlendorf 19f58048cb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 14:16:39 -08:00
Brian Behlendorf 104396b70f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-09 14:16:13 -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 e22d4754cc Build system cleanup 2008-12-09 13:51:31 -08:00
Brian Behlendorf 1654a48217 Build system update 2008-12-09 13:46:53 -08:00
Brian Behlendorf a6be122d45 Resolve conflict 2008-12-09 13:41:28 -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 8f660a1384 Resolve conflict 2008-12-09 13:39:42 -08:00
Brian Behlendorf bde4b75732 Resolve conflict 2008-12-09 13:38:29 -08:00
Brian Behlendorf d2b7b2c0de Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-09 13:34:12 -08:00
Brian Behlendorf 48343be6a3 Temporarily move taskq+util to libzpool until that directory is broken in to lib+module 2008-12-09 13:32:01 -08:00
Brian Behlendorf 14ee9a41e5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-09 12:42:29 -08:00
Brian Behlendorf 69a1156686 Add missing u8 header 2008-12-09 12:38:02 -08:00
Brian Behlendorf ac01276013 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 16:59:21 -08:00
Brian Behlendorf a0452e7349 Remove lint dependency 2008-12-08 16:55:20 -08:00
Brian Behlendorf a7035dd8c9 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-08 16:50:01 -08:00
Brian Behlendorf c9e7ffd777 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 16:47:04 -08:00
Brian Behlendorf eb4c9bf039 Update makefiles, kernel.c moved to libzpool 2008-12-08 16:41:14 -08:00
Brian Behlendorf 16965f00c0 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-08 16:28:47 -08:00
Brian Behlendorf ecc7db2f26 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 16:25:41 -08:00
Brian Behlendorf 4caa960910 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 16:25:36 -08:00
Brian Behlendorf 2df3f3637d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-08 16:24:45 -08:00
Brian Behlendorf 4e0eae9138 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-08 16:24:14 -08:00
Brian Behlendorf d86369e5c6 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-08 16:24:13 -08:00
Brian Behlendorf 2b67f51fb6 Attempt move of kernel.c with topgit 2008-12-08 16:20:25 -08:00
Brian Behlendorf bffeaec6c1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 15:37:50 -08:00
Brian Behlendorf b4207042da Add a few more missing headers 2008-12-08 15:36:08 -08:00
Brian Behlendorf a62f51b079 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 15:34:50 -08:00
Brian Behlendorf 7b32749fba Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-08 15:34:49 -08:00
Brian Behlendorf 67a6646d93 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 15:33:33 -08:00
Brian Behlendorf 912f4f1e1d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 15:33:31 -08:00
Brian Behlendorf a5b90e4746 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-08 15:33:31 -08:00
Brian Behlendorf bb55a4f104 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-08 15:33:30 -08:00
Brian Behlendorf 7b4a040002 Correct missing void in prototype 2008-12-08 15:31:41 -08:00
Brian Behlendorf 0ef6712826 Add missing #include <va_list.h> 2008-12-08 15:29:59 -08:00
Brian Behlendorf a39b27b7af Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 15:18:28 -08:00
Brian Behlendorf 65250ad4f0 Add missing headers 2008-12-08 15:16:22 -08:00
Brian Behlendorf b472df7814 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 15:08:02 -08:00
Brian Behlendorf 2f6187c243 Add libumem to makefile, remove spl.h dependency 2008-12-08 15:06:20 -08:00
Brian Behlendorf 725d82bac9 Add several missing headers, more to follow as needed 2008-12-08 15:00:32 -08:00
Brian Behlendorf 3427620cbc Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-08 13:51:38 -08:00
Brian Behlendorf 02844b68e9 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-08 13:51:37 -08:00
Brian Behlendorf 2a8f41725b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 13:50:23 -08:00
Brian Behlendorf 93b07767fb Add missing libspl/zu.c stub 2008-12-08 13:48:38 -08:00
Brian Behlendorf e944b6b060 Add sys/int_limits.h stub 2008-12-08 13:47:21 -08:00