Commit Graph

154 Commits

Author SHA1 Message Date
Brian Behlendorf f06b5c462e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-09 14:25:51 -08:00
Brian Behlendorf 7489df5960 Refresh Makefiles for new files 2008-12-09 14:23:45 -08:00
Brian Behlendorf 4768609122 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-09 14:16:54 -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 8acd1663f9 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-09 13:57:55 -08:00
Brian Behlendorf 1654a48217 Build system update 2008-12-09 13:46:53 -08:00
Brian Behlendorf 1145019bf9 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-09 13:42:18 -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 30cf74333a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 16:47:34 -08:00
Brian Behlendorf eb4c9bf039 Update makefiles, kernel.c moved to libzpool 2008-12-08 16:41:14 -08:00
Brian Behlendorf befd9fa10a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 16:26:06 -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 9e7fd02c7f Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 15:33:44 -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 dad1d28a2b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 13:50:33 -08:00
Brian Behlendorf 93b07767fb Add missing libspl/zu.c stub 2008-12-08 13:48:38 -08:00
Brian Behlendorf 70488696ec Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 11:28:27 -08:00
Brian Behlendorf 5d31b4febd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 11:28:15 -08:00
Brian Behlendorf e60cd17a6a Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-08 11:28:14 -08:00
Brian Behlendorf 94b08b3b91 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-08 11:28:13 -08:00
Brian Behlendorf 7c6de8b41c Add missing cast 2008-12-08 10:32:55 -08:00
Brian Behlendorf 8af5e22d21 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 10:20:13 -08:00
Brian Behlendorf 85f71237d9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 10:20:01 -08:00
Brian Behlendorf 35c322451f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-08 10:20:00 -08:00
Brian Behlendorf 5cf55d35dd Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-08 10:20:00 -08:00
Brian Behlendorf fd39fc67d0 Fix invalid %llf format by dropping useless ll prefix 2008-12-08 10:18:11 -08:00
Brian Behlendorf 5080757452 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-08 10:12:11 -08:00
Brian Behlendorf c6b3007cbe Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 10:11:59 -08:00
Brian Behlendorf 17c6f97565 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-08 10:11:58 -08:00
Brian Behlendorf 7fc98fdcdf Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-08 10:11:57 -08:00
Brian Behlendorf 4537766d57 Initialize unused sepp to NULL 2008-12-08 10:10:03 -08:00
Brian Behlendorf 83b0367af0 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-05 14:52:45 -08:00
Brian Behlendorf 9af0176ad7 Add zu.c file for build system 2008-12-05 14:50:51 -08:00
Brian Behlendorf edd0a6552c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-05 14:22:07 -08:00
Brian Behlendorf 18266508c7 Change libport+libsolcompat references to libspl 2008-12-05 14:20:33 -08:00