Brian Behlendorf
|
ba7ccf8ccd
|
Cast to unsigned long long for 32-bit arches
|
2009-12-11 11:41:04 -08:00 |
|
Brian Behlendorf
|
664025877c
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:52 -08:00 |
|
Brian Behlendorf
|
3d17dbfa84
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-11-24 15:52:50 -08:00 |
|
Brian Behlendorf
|
772cb0f0b0
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:45 -08:00 |
|
Brian Behlendorf
|
cc180ae279
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-11-24 15:52:43 -08:00 |
|
Brian Behlendorf
|
01117b965d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:39 -08:00 |
|
Brian Behlendorf
|
24eb001a38
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-11-24 15:52:36 -08:00 |
|
Brian Behlendorf
|
9cc792fff7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:32 -08:00 |
|
Brian Behlendorf
|
21005d4bf4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-24 15:52:30 -08:00 |
|
Brian Behlendorf
|
5a600fd515
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:25 -08:00 |
|
Brian Behlendorf
|
ffa4167a7b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-11-24 15:52:23 -08:00 |
|
Brian Behlendorf
|
4e9252b4dc
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:18 -08:00 |
|
Brian Behlendorf
|
4177b182ab
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-24 15:52:16 -08:00 |
|
Brian Behlendorf
|
b931d27ac0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:11 -08:00 |
|
Brian Behlendorf
|
35d5a20099
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-24 15:52:09 -08:00 |
|
Brian Behlendorf
|
f43b57d793
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:52:04 -08:00 |
|
Brian Behlendorf
|
692fc218f0
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-24 15:52:02 -08:00 |
|
Brian Behlendorf
|
53b51f6f7e
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:57 -08:00 |
|
Brian Behlendorf
|
023e766377
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-24 15:51:55 -08:00 |
|
Brian Behlendorf
|
c5959cd098
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:50 -08:00 |
|
Brian Behlendorf
|
69c72b0f0a
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-24 15:51:48 -08:00 |
|
Brian Behlendorf
|
9bffa8d36e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:43 -08:00 |
|
Brian Behlendorf
|
2161ccab6c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-24 15:51:41 -08:00 |
|
Brian Behlendorf
|
1cb221aa8c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-24 15:51:41 -08:00 |
|
Brian Behlendorf
|
1a0907a00a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:32 -08:00 |
|
Brian Behlendorf
|
80a4449d7e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-24 15:51:30 -08:00 |
|
Brian Behlendorf
|
e3b9337368
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:25 -08:00 |
|
Brian Behlendorf
|
0c50fd617d
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-24 15:51:23 -08:00 |
|
Brian Behlendorf
|
0070c5489c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:18 -08:00 |
|
Brian Behlendorf
|
037ccf2011
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-24 15:51:16 -08:00 |
|
Brian Behlendorf
|
b5bf754f7b
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:51:11 -08:00 |
|
Brian Behlendorf
|
73b4663195
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-11-24 15:51:09 -08:00 |
|
Brian Behlendorf
|
0ec3a0ef62
|
Add udev rules to zfs-test package
|
2009-11-24 15:48:16 -08:00 |
|
Brian Behlendorf
|
4551fc6f86
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:00:42 -08:00 |
|
Brian Behlendorf
|
dd475e30fe
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-11-24 15:00:40 -08:00 |
|
Brian Behlendorf
|
a103bb386f
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:00:35 -08:00 |
|
Brian Behlendorf
|
da9ca43226
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-11-24 15:00:33 -08:00 |
|
Brian Behlendorf
|
154548b928
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:00:28 -08:00 |
|
Brian Behlendorf
|
8e481beac7
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-11-24 15:00:26 -08:00 |
|
Brian Behlendorf
|
2df25fad96
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:00:22 -08:00 |
|
Brian Behlendorf
|
e556b8d858
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-24 15:00:20 -08:00 |
|
Brian Behlendorf
|
1a2ba64e4e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:00:14 -08:00 |
|
Brian Behlendorf
|
3ccac0b5c5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-11-24 15:00:12 -08:00 |
|
Brian Behlendorf
|
1b75c313b0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-24 15:00:06 -08:00 |
|
Brian Behlendorf
|
4da3208f00
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-24 15:00:04 -08:00 |
|
Brian Behlendorf
|
e844bc72e6
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:58 -08:00 |
|
Brian Behlendorf
|
dd6f3b0b97
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-24 14:59:56 -08:00 |
|
Brian Behlendorf
|
d3220a2dd1
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:51 -08:00 |
|
Brian Behlendorf
|
f8a56e1782
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-24 14:59:49 -08:00 |
|
Brian Behlendorf
|
28f02c9250
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:43 -08:00 |