Brian Behlendorf
|
3ffdb14680
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 15:43:51 -08:00 |
|
Brian Behlendorf
|
9a54db7edf
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 15:43:51 -08:00 |
|
Brian Behlendorf
|
390146458e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-14 15:43:43 -08:00 |
|
Brian Behlendorf
|
9c22d76019
|
Minor 'make check' updates
|
2009-01-14 15:38:56 -08:00 |
|
Brian Behlendorf
|
d880a2af98
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 14:27:37 -08:00 |
|
Brian Behlendorf
|
2b32a0752f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 14:27:36 -08:00 |
|
Brian Behlendorf
|
4fdb04d0a1
|
A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need
|
2009-01-14 14:25:25 -08:00 |
|
Brian Behlendorf
|
384c8d49b0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 13:46:17 -08:00 |
|
Brian Behlendorf
|
d730906f9b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 13:46:16 -08:00 |
|
Brian Behlendorf
|
9beccacec1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-14 13:46:09 -08:00 |
|
Brian Behlendorf
|
1c54d0d15d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-14 13:45:31 -08:00 |
|
Brian Behlendorf
|
095c83db71
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-14 13:45:31 -08:00 |
|
Brian Behlendorf
|
d1e802ec14
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-14 13:45:30 -08:00 |
|
Brian Behlendorf
|
a7e8d5a15a
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-14 13:45:30 -08:00 |
|
Brian Behlendorf
|
99d075d922
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-14 13:45:28 -08:00 |
|
Brian Behlendorf
|
d443f1ae05
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-14 13:45:28 -08:00 |
|
Brian Behlendorf
|
06b00a5951
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-01-14 13:45:27 -08:00 |
|
Brian Behlendorf
|
3e7127371a
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-01-14 13:45:27 -08:00 |
|
Brian Behlendorf
|
f2c3f362c1
|
Update topmsg
|
2009-01-14 13:42:08 -08:00 |
|
Brian Behlendorf
|
57f204f6fd
|
Update topmsg
|
2009-01-14 13:41:56 -08:00 |
|
Brian Behlendorf
|
95576ca7a8
|
Update topmsg
|
2009-01-14 13:41:28 -08:00 |
|
Brian Behlendorf
|
1b6bc0866d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 13:32:40 -08:00 |
|
Brian Behlendorf
|
b874e980f9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 13:32:39 -08:00 |
|
Brian Behlendorf
|
c0edd1f948
|
Remove unneeded header
|
2009-01-14 13:30:32 -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
|
f63f4dd2cd
|
Remove unneeded chunk, create a FS the real way with an ioctl
|
2009-01-14 08:26:09 -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
|
fce0143a40
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 16:07:45 -08:00 |
|
Brian Behlendorf
|
04d7ae5f22
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 16:06:28 -08:00 |
|
Brian Behlendorf
|
c186f81c6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 16:06:26 -08:00 |
|
Brian Behlendorf
|
fe0f26150a
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 16:06:24 -08:00 |
|
Brian Behlendorf
|
e1632568f1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 16:06:23 -08:00 |
|
Brian Behlendorf
|
be0b4029db
|
Initialize list links
|
2009-01-13 16:02:19 -08:00 |
|
Brian Behlendorf
|
d92517e2a1
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
9cccf52448
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
c3335290e2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:34:38 -08:00 |
|
Brian Behlendorf
|
32baeb1712
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
0d6b81fcca
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:34:00 -08:00 |
|
Brian Behlendorf
|
3f5fdfbf8b
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
43cd437415
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
94944fab96
|
Fix proper list node initialization
|
2009-01-13 15:31:58 -08:00 |
|
Brian Behlendorf
|
5691cd6443
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:07:53 -08:00 |
|
Brian Behlendorf
|
f661985075
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:07:52 -08:00 |
|
Brian Behlendorf
|
925ed2c7a0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:07:44 -08:00 |
|
Brian Behlendorf
|
b14513e826
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:07:08 -08:00 |
|
Brian Behlendorf
|
4c31283afc
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:07:07 -08:00 |
|
Brian Behlendorf
|
cad99cbd51
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 15:07:06 -08:00 |
|
Brian Behlendorf
|
2e9cd667d0
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-13 15:07:06 -08:00 |