Brian Behlendorf
|
9e40470aa0
|
Resolve conflict
|
2009-01-14 15:42:28 -08:00 |
|
Brian Behlendorf
|
1406bb78e6
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-14 15:41:05 -08:00 |
|
Brian Behlendorf
|
9c22d76019
|
Minor 'make check' updates
|
2009-01-14 15:38:56 -08:00 |
|
Brian Behlendorf
|
1224d8bf5b
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-14 14:27:43 -08:00 |
|
Brian Behlendorf
|
aff2252263
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 14:27:42 -08:00 |
|
Brian Behlendorf
|
96a29baaee
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-14 14:27:38 -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
|
fd93449de9
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 14:27:31 -08:00 |
|
Brian Behlendorf
|
b505c50b6c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 14:27:29 -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
|
a8182b08e4
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:47:17 -08:00 |
|
Brian Behlendorf
|
52599a1501
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-14 13:47:15 -08:00 |
|
Brian Behlendorf
|
1c1b9cc271
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:47:12 -08:00 |
|
Brian Behlendorf
|
2cf937fe11
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-14 13:47:11 -08:00 |
|
Brian Behlendorf
|
8c42cdd9b7
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:47:07 -08:00 |
|
Brian Behlendorf
|
2596d57bd6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-14 13:47:06 -08:00 |
|
Brian Behlendorf
|
2bf2447653
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:47:03 -08:00 |
|
Brian Behlendorf
|
0965cd15f2
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-14 13:47:01 -08:00 |
|
Brian Behlendorf
|
bcf1114286
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:58 -08:00 |
|
Brian Behlendorf
|
2d9de2b1e9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-14 13:46:56 -08:00 |
|
Brian Behlendorf
|
07c35cdc95
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:53 -08:00 |
|
Brian Behlendorf
|
b4f14d0cb4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-14 13:46:51 -08:00 |
|
Brian Behlendorf
|
2bbc760150
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:48 -08:00 |
|
Brian Behlendorf
|
fe9eb67ae1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-14 13:46:46 -08:00 |
|
Brian Behlendorf
|
755316e6b7
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:43 -08:00 |
|
Brian Behlendorf
|
4f34db7b44
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-14 13:46:42 -08:00 |
|
Brian Behlendorf
|
6af72a0a99
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:38 -08:00 |
|
Brian Behlendorf
|
db2890df46
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-14 13:46:37 -08:00 |
|
Brian Behlendorf
|
3f4d9935c6
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:33 -08:00 |
|
Brian Behlendorf
|
630530c330
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-14 13:46:32 -08:00 |
|
Brian Behlendorf
|
a8cfd1eeb0
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:28 -08:00 |
|
Brian Behlendorf
|
2995ddbf92
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-14 13:46:27 -08:00 |
|
Brian Behlendorf
|
49b49a7d8d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:23 -08:00 |
|
Brian Behlendorf
|
192abfeec9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 13:46:22 -08:00 |
|
Brian Behlendorf
|
2ecb161746
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:19 -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
|
cc577c855d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:11 -08:00 |
|
Brian Behlendorf
|
8cda503c6a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 13:46:10 -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
|
7c873e2422
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:46:03 -08:00 |
|
Brian Behlendorf
|
d420b542cc
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-14 13:46:02 -08:00 |
|
Brian Behlendorf
|
f36742e16f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:45:58 -08:00 |
|
Brian Behlendorf
|
3dcba1a896
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-14 13:45:57 -08:00 |
|
Brian Behlendorf
|
567004da4f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:45:53 -08:00 |
|
Brian Behlendorf
|
39c0ab1742
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-14 13:45:52 -08:00 |
|
Brian Behlendorf
|
104b8895d9
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:45:49 -08:00 |
|
Brian Behlendorf
|
7b0b62a5bc
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-14 13:45:47 -08:00 |
|
Brian Behlendorf
|
e42c480499
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:45:44 -08:00 |