Brian Behlendorf
|
03f6a88536
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 08:42:29 -08:00 |
|
Brian Behlendorf
|
a677f7cba9
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:24 -08:00 |
|
Brian Behlendorf
|
926ec0657d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 08:42:21 -08:00 |
|
Brian Behlendorf
|
04443d2d7a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 08:42:19 -08:00 |
|
Brian Behlendorf
|
ad1dde3678
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:11 -08:00 |
|
Brian Behlendorf
|
b8ca971861
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 08:42:00 -08:00 |
|
Brian Behlendorf
|
1194e0412f
|
Change all instances of kpios to zpios
|
2009-01-14 08:38:35 -08:00 |
|
Brian Behlendorf
|
f63f4dd2cd
|
Remove unneeded chunk, create a FS the real way with an ioctl
|
2009-01-14 08:26:09 -08:00 |
|
Brian Behlendorf
|
4497cfb321
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:49:26 -08:00 |
|
Brian Behlendorf
|
9ab30b2e96
|
Use zpios not kpios for referce
|
2009-01-13 16:42:21 -08:00 |
|
Brian Behlendorf
|
b39462cdff
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:10:05 -08:00 |
|
Brian Behlendorf
|
7423bcfe2a
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 16:10:01 -08:00 |
|
Brian Behlendorf
|
e274bb15c1
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:09:54 -08:00 |
|
Brian Behlendorf
|
6b4efd1194
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-13 16:09:50 -08:00 |
|
Brian Behlendorf
|
3f128d0436
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:09:43 -08:00 |
|
Brian Behlendorf
|
401aac51fb
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-13 16:09:40 -08:00 |
|
Brian Behlendorf
|
474ce677d7
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:09:31 -08:00 |
|
Brian Behlendorf
|
7635d14cd1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 16:09:27 -08:00 |
|
Brian Behlendorf
|
eed856bb54
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:09:20 -08:00 |
|
Brian Behlendorf
|
6942c0a989
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-13 16:09:16 -08:00 |
|
Brian Behlendorf
|
8a91d804d7
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:09:09 -08:00 |
|
Brian Behlendorf
|
5b86949716
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-13 16:09:05 -08:00 |
|
Brian Behlendorf
|
7347b35b70
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:08:58 -08:00 |
|
Brian Behlendorf
|
d176f1e6a3
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-13 16:08:54 -08:00 |
|
Brian Behlendorf
|
1f94d158dc
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:08:47 -08:00 |
|
Brian Behlendorf
|
fd3adc8f0a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 16:08:43 -08:00 |
|
Brian Behlendorf
|
2054d17ee4
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:08:36 -08:00 |
|
Brian Behlendorf
|
2dac6d5542
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 16:08:32 -08:00 |
|
Brian Behlendorf
|
8c7162bec7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:08:26 -08:00 |
|
Brian Behlendorf
|
df809b8ca1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 16:08:23 -08:00 |
|
Brian Behlendorf
|
b36707f565
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:08:17 -08:00 |
|
Brian Behlendorf
|
ae893fadc9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 16:08:13 -08:00 |
|
Brian Behlendorf
|
eb0a17fbe5
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:08:06 -08:00 |
|
Brian Behlendorf
|
ef9e51e506
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 16:08:03 -08:00 |
|
Brian Behlendorf
|
97f656ab18
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 16:08:02 -08:00 |
|
Brian Behlendorf
|
a8a0283204
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:07:51 -08:00 |
|
Brian Behlendorf
|
7783aee79c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 16:07:47 -08:00 |
|
Brian Behlendorf
|
fce0143a40
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 16:07:45 -08:00 |
|
Brian Behlendorf
|
cb5b8408d2
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:07:34 -08:00 |
|
Brian Behlendorf
|
2c5a2b94cf
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-13 16:07:30 -08:00 |
|
Brian Behlendorf
|
d91c42a173
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:07:25 -08:00 |
|
Brian Behlendorf
|
f36643fb52
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-13 16:07:22 -08:00 |
|
Brian Behlendorf
|
7fa2345915
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:07:16 -08:00 |
|
Brian Behlendorf
|
ebf100fd71
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-13 16:07:13 -08:00 |
|
Brian Behlendorf
|
3da2707217
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:07:08 -08:00 |
|
Brian Behlendorf
|
be33d1ad61
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-13 16:07:05 -08:00 |
|
Brian Behlendorf
|
307bc7a35a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:06:58 -08:00 |
|
Brian Behlendorf
|
66889afe82
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 16:06:54 -08:00 |
|
Brian Behlendorf
|
ab7c76d08c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:06:47 -08:00 |
|
Brian Behlendorf
|
affc86a5d8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-13 16:06:44 -08:00 |