Brian Behlendorf
|
0dcf124a5e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 13:58:40 -08:00 |
|
Brian Behlendorf
|
1654a48217
|
Build system update
|
2008-12-09 13:46:53 -08:00 |
|
Brian Behlendorf
|
820c397107
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 13:43:04 -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
|
4e626e24ce
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 16:49:02 -08:00 |
|
Brian Behlendorf
|
eb4c9bf039
|
Update makefiles, kernel.c moved to libzpool
|
2008-12-08 16:41:14 -08:00 |
|
Brian Behlendorf
|
765a9d43eb
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 16:27:46 -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
|
c0b2421b22
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 15:34:25 -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
|
d947c3f1a2
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 13:51:13 -08:00 |
|
Brian Behlendorf
|
93b07767fb
|
Add missing libspl/zu.c stub
|
2008-12-08 13:48:38 -08:00 |
|
Brian Behlendorf
|
082a572553
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 11:29:06 -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
|
c39199a4e1
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 10:20:51 -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
|
3d81c63cbd
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 10:12:49 -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
|
104a367047
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-05 14:53:25 -08:00 |
|
Brian Behlendorf
|
9af0176ad7
|
Add zu.c file for build system
|
2008-12-05 14:50:51 -08:00 |
|
Brian Behlendorf
|
2724e266e7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-05 14:22:47 -08:00 |
|
Brian Behlendorf
|
18266508c7
|
Change libport+libsolcompat references to libspl
|
2008-12-05 14:20:33 -08:00 |
|
Brian Behlendorf
|
a5e3d71fd4
|
Refresh linux-kernel-disk
|
2008-12-05 11:16:18 -08:00 |
|
Brian Behlendorf
|
9baaa468ac
|
Refresh zfs-branch
|
2008-12-05 09:46:11 -08:00 |
|
Brian Behlendorf
|
b151bbbb44
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-05 09:36:28 -08:00 |
|
Brian Behlendorf
|
7a34cab76d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-05 09:36:20 -08:00 |
|
Brian Behlendorf
|
74e79d3bf6
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:36 -08:00 |
|
Brian Behlendorf
|
779061eb3f
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:28 -08:00 |
|
Brian Behlendorf
|
f87b4ddad7
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:21 -08:00 |
|
Brian Behlendorf
|
db27ad2a22
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:15 -08:00 |