Brian Behlendorf
|
f6f3c46840
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:16:17 -08:00 |
|
Brian Behlendorf
|
e4a4ad147a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:16:16 -08:00 |
|
Brian Behlendorf
|
cc40d91977
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:16:12 -08:00 |
|
Brian Behlendorf
|
a9361a459e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:16:10 -08:00 |
|
Brian Behlendorf
|
d71643eb94
|
Refresh exported symbols
|
2009-01-06 09:14:10 -08:00 |
|
Brian Behlendorf
|
9a4b808627
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:03:59 -08:00 |
|
Brian Behlendorf
|
574f1ecfec
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:03:57 -08:00 |
|
Brian Behlendorf
|
0ed3a3d48a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:03:54 -08:00 |
|
Brian Behlendorf
|
43e4426b34
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:03:52 -08:00 |
|
Brian Behlendorf
|
b521002205
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:03:51 -08:00 |
|
Brian Behlendorf
|
3013823bbe
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:03:44 -08:00 |
|
Brian Behlendorf
|
bb6a56e778
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:03:39 -08:00 |
|
Brian Behlendorf
|
1c496f0235
|
Refresh exported spa_config symbols
|
2009-01-06 08:59:36 -08:00 |
|
Brian Behlendorf
|
3e9ecdb05d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-06 08:44:14 -08:00 |
|
Brian Behlendorf
|
4522c570e8
|
Add missing prototype
|
2009-01-06 08:39:45 -08:00 |
|
Brian Behlendorf
|
37fbec5b71
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:59:36 -08:00 |
|
Brian Behlendorf
|
972e33ef17
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:59:33 -08:00 |
|
Brian Behlendorf
|
554e66717b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:59:30 -08:00 |
|
Brian Behlendorf
|
c12f9e89ac
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:59:23 -08:00 |
|
Brian Behlendorf
|
3edbae3a2d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:59:20 -08:00 |
|
Brian Behlendorf
|
7feda9d67d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:59:18 -08:00 |
|
Brian Behlendorf
|
23ea9e6a3a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:59:07 -08:00 |
|
Brian Behlendorf
|
e7f04030d2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 16:59:02 -08:00 |
|
Brian Behlendorf
|
90ff526841
|
Remove symbol exports no longer needed with the dsl scrub rewrite
|
2009-01-05 16:55:15 -08:00 |
|
Brian Behlendorf
|
3a1f0dcde1
|
Refresh prototype due to upstream changes
|
2009-01-05 16:53:23 -08:00 |
|
Brian Behlendorf
|
cd946828a5
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:41:46 -08:00 |
|
Brian Behlendorf
|
ec5f706c33
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 16:41:42 -08:00 |
|
Brian Behlendorf
|
56260da743
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:41:35 -08:00 |
|
Brian Behlendorf
|
09ece04126
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 16:41:31 -08:00 |
|
Brian Behlendorf
|
009355da41
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:41:25 -08:00 |
|
Brian Behlendorf
|
10f84ca668
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 16:41:21 -08:00 |
|
Brian Behlendorf
|
05b00626b1
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:41:13 -08:00 |
|
Brian Behlendorf
|
e3bb3d635d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 16:41:09 -08:00 |
|
Brian Behlendorf
|
62993ecd3e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:41:02 -08:00 |
|
Brian Behlendorf
|
a25d295198
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 16:40:58 -08:00 |
|
Brian Behlendorf
|
1f1d2500ec
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:51 -08:00 |
|
Brian Behlendorf
|
834679e9d0
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 16:40:47 -08:00 |
|
Brian Behlendorf
|
beb33f687b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:40 -08:00 |
|
Brian Behlendorf
|
0b46ca1f5c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 16:40:36 -08:00 |
|
Brian Behlendorf
|
636a0d18f7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:30 -08:00 |
|
Brian Behlendorf
|
fd4be9bb6e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 16:40:26 -08:00 |
|
Brian Behlendorf
|
0a9102d48c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:19 -08:00 |
|
Brian Behlendorf
|
ef1c43e66f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 16:40:14 -08:00 |
|
Brian Behlendorf
|
5c3965be17
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:40:07 -08:00 |
|
Brian Behlendorf
|
8c5d486797
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 16:40:03 -08:00 |
|
Brian Behlendorf
|
7e94ad04e7
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:57 -08:00 |
|
Brian Behlendorf
|
3283dd9715
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:39:54 -08:00 |
|
Brian Behlendorf
|
30201d3275
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:39:48 -08:00 |
|
Brian Behlendorf
|
4f8a8bc8da
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:39:44 -08:00 |
|
Brian Behlendorf
|
7b1eb5d131
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:39:42 -08:00 |