Brian Behlendorf
|
bdb0ce1a0d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 14:18:11 -08:00 |
|
Brian Behlendorf
|
552c9e1abb
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 14:18:10 -08:00 |
|
Brian Behlendorf
|
76151804d7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 14:18:09 -08:00 |
|
Brian Behlendorf
|
c6f1eca44b
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 14:18:09 -08:00 |
|
Brian Behlendorf
|
2ea04834bf
|
Remove assertion for now
|
2009-01-13 14:16:11 -08:00 |
|
Brian Behlendorf
|
12b7ed892c
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 14:14:22 -08:00 |
|
Brian Behlendorf
|
d8561dd52a
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 14:14:22 -08:00 |
|
Brian Behlendorf
|
c638d63e0e
|
New TopGit dependency: fix-list
|
2009-01-13 14:14:20 -08:00 |
|
Brian Behlendorf
|
877f035097
|
Add topmsg
|
2009-01-13 14:14:11 -08:00 |
|
Brian Behlendorf
|
20bc74fccf
|
Remove dependency
|
2009-01-13 14:11:50 -08:00 |
|
Brian Behlendorf
|
c4f7d991f6
|
New TopGit dependency: fix-list
|
2009-01-13 14:08:14 -08:00 |
|
Brian Behlendorf
|
eea2f939cb
|
Remove fix-list
|
2009-01-13 14:06:30 -08:00 |
|
Brian Behlendorf
|
f7295e4683
|
New TopGit dependency: fix-list
|
2009-01-13 13:47:51 -08:00 |
|
Brian Behlendorf
|
da29733e77
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-13 13:32:48 -08:00 |
|
Brian Behlendorf
|
f8b66dcc4f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 13:32:31 -08:00 |
|
Brian Behlendorf
|
16c26fa9cd
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
8ad629750e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
bb9b10a830
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-13 13:32:29 -08:00 |
|
Brian Behlendorf
|
b73b29ab8e
|
Fix c90 issue with { }
|
2009-01-13 13:30:35 -08:00 |
|
Brian Behlendorf
|
6238e451b7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-13 11:56:43 -08:00 |
|
Brian Behlendorf
|
bba6e9829d
|
Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings
|
2009-01-13 11:54:38 -08:00 |
|
Brian Behlendorf
|
193dc509d0
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 15:10:38 -08:00 |
|
Brian Behlendorf
|
6791a1ee34
|
I don't think we need this in userspace
|
2009-01-09 15:07:32 -08:00 |
|
Brian Behlendorf
|
c42f0c8d74
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 14:45:25 -08:00 |
|
Brian Behlendorf
|
ff09d64647
|
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
|
2009-01-09 14:37:45 -08:00 |
|
Brian Behlendorf
|
44711020bb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 14:18:04 -08:00 |
|
Brian Behlendorf
|
6b32aaea67
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
86eb46d20b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
0e3bb44848
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
578c9645df
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
902ce659b0
|
Fix c90 compliance issue
|
2009-01-09 14:15:56 -08:00 |
|
Brian Behlendorf
|
45695d15ee
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 13:33:26 -08:00 |
|
Brian Behlendorf
|
7a7a074d3d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 13:33:11 -08:00 |
|
Brian Behlendorf
|
cd5e331e68
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
fb79976d3c
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
953d302b87
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-09 13:33:09 -08:00 |
|
Brian Behlendorf
|
04638ead67
|
Change zpool module name to zfs and update references
|
2009-01-09 13:31:16 -08:00 |
|
Brian Behlendorf
|
ca4fc6ef63
|
Fix cast
|
2009-01-09 13:29:41 -08:00 |
|
Brian Behlendorf
|
ea3a11c275
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 12:47:28 -08:00 |
|
Brian Behlendorf
|
129afe3ce8
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 12:46:44 -08:00 |
|
Brian Behlendorf
|
b4d27767d8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 12:46:42 -08:00 |
|
Brian Behlendorf
|
d64233083d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-09 12:46:41 -08:00 |
|
Brian Behlendorf
|
b3064162aa
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-01-09 12:46:40 -08:00 |
|
Brian Behlendorf
|
cb5fc9440b
|
Remove extra defaults
|
2009-01-09 12:42:27 -08:00 |
|
Brian Behlendorf
|
6bf5694a1a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 11:31:16 -08:00 |
|
Brian Behlendorf
|
d7f4512ed3
|
Quiet warnings for now
|
2009-01-09 11:29:00 -08:00 |
|
Brian Behlendorf
|
814d344f5e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 09:22:01 -08:00 |
|
Brian Behlendorf
|
91b9bf3f40
|
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
|
2009-01-09 09:19:33 -08:00 |
|
Brian Behlendorf
|
c1233efa86
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-08 16:25:33 -08:00 |
|
Brian Behlendorf
|
cd0b9c18b7
|
Update helper scripts
|
2009-01-08 16:20:25 -08:00 |