Brian Behlendorf
|
cca384cc3d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 12:36:29 -08:00 |
|
Brian Behlendorf
|
65923b99f9
|
Update to use DS_MODE_USER not removed DS_MODE_STANDARD
|
2009-01-06 12:32:44 -08:00 |
|
Brian Behlendorf
|
31781c93df
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 11:38:37 -08:00 |
|
Brian Behlendorf
|
a6dba6330c
|
Add missing include paths
|
2009-01-06 11:36:56 -08:00 |
|
Brian Behlendorf
|
d000467b7f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 11:04:16 -08:00 |
|
Brian Behlendorf
|
fa03d4582f
|
Remove circular dependency
|
2009-01-06 11:02:36 -08:00 |
|
Brian Behlendorf
|
608b2dd1c0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:57:22 -08:00 |
|
Brian Behlendorf
|
d785c6d77a
|
Should use zpios not kpios
|
2009-01-06 09:55:40 -08:00 |
|
Brian Behlendorf
|
b9e46825f5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:50:16 -08:00 |
|
Brian Behlendorf
|
11b7f20ce1
|
Ensure zpios module makefile is built
|
2009-01-06 09:48:33 -08:00 |
|
Brian Behlendorf
|
def6835af7
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:40:37 -08:00 |
|
Brian Behlendorf
|
280aa071b5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:40:35 -08:00 |
|
Brian Behlendorf
|
6457687843
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:40:33 -08:00 |
|
Brian Behlendorf
|
461db1ecc9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:40:31 -08:00 |
|
Brian Behlendorf
|
889a81fcf2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:40:30 -08:00 |
|
Brian Behlendorf
|
81ec019880
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:40:26 -08:00 |
|
Brian Behlendorf
|
5bd66364e9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:40:24 -08:00 |
|
Brian Behlendorf
|
da647d38a3
|
Refresh exported symbols, remove zio_resume_threads as out of date
|
2009-01-06 09:38:39 -08:00 |
|
Brian Behlendorf
|
ec3da48ada
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:31:25 -08:00 |
|
Brian Behlendorf
|
5c2ffdd137
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-06 09:31:24 -08:00 |
|
Brian Behlendorf
|
002a3ba66f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:31:21 -08:00 |
|
Brian Behlendorf
|
10b67bf86e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-06 09:31:20 -08:00 |
|
Brian Behlendorf
|
b15594d40f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:31:17 -08:00 |
|
Brian Behlendorf
|
2471e12637
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-06 09:31:16 -08:00 |
|
Brian Behlendorf
|
f674efeeae
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:31:13 -08:00 |
|
Brian Behlendorf
|
1203be7caa
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-06 09:31:11 -08:00 |
|
Brian Behlendorf
|
eb207b74fd
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:31:08 -08:00 |
|
Brian Behlendorf
|
c007e09cae
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-06 09:31:07 -08:00 |
|
Brian Behlendorf
|
d5ca89c493
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:31:04 -08:00 |
|
Brian Behlendorf
|
802acd05cf
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-06 09:31:02 -08:00 |
|
Brian Behlendorf
|
894636a700
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:59 -08:00 |
|
Brian Behlendorf
|
2d844567bd
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-06 09:30:58 -08:00 |
|
Brian Behlendorf
|
3c62d10598
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:55 -08:00 |
|
Brian Behlendorf
|
61032f1ce6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 09:30:54 -08:00 |
|
Brian Behlendorf
|
8c08b72483
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:51 -08:00 |
|
Brian Behlendorf
|
37555b8fe3
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 09:30:49 -08:00 |
|
Brian Behlendorf
|
d75303b007
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:46 -08:00 |
|
Brian Behlendorf
|
7d73a17e54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 09:30:45 -08:00 |
|
Brian Behlendorf
|
1c8fca2eca
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:42 -08:00 |
|
Brian Behlendorf
|
03a7b3761b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:30:41 -08:00 |
|
Brian Behlendorf
|
5d356db791
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:38 -08:00 |
|
Brian Behlendorf
|
ac63920b2c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:30:36 -08:00 |
|
Brian Behlendorf
|
abca9d8b9a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:30:36 -08:00 |
|
Brian Behlendorf
|
8aed984c7e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:31 -08:00 |
|
Brian Behlendorf
|
82458be35a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:30:30 -08:00 |
|
Brian Behlendorf
|
bc820e95a6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 09:30:29 -08:00 |
|
Brian Behlendorf
|
1775e769d4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:24 -08:00 |
|
Brian Behlendorf
|
be5d20f436
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-06 09:30:23 -08:00 |
|
Brian Behlendorf
|
f207329aa9
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:30:20 -08:00 |
|
Brian Behlendorf
|
0a3f36db42
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-06 09:30:18 -08:00 |