Brian Behlendorf
|
5a3e63ff19
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-14 15:38:46 -07:00 |
Ricardo M. Correia
|
4279777f47
|
Fixed the zpool and zfs commands returning 'internal error: Out of memory.' due to a failure in nvlist_common().
The failure turned out to be missing macro definitions for little
endian and big endian.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
2009-07-14 15:31:03 -07:00 |
|
Brian Behlendorf
|
54624d4361
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:40:12 -07:00 |
|
Brian Behlendorf
|
3565a03f5b
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-14 14:40:09 -07:00 |
|
Brian Behlendorf
|
d9cb4edf2d
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:40:00 -07:00 |
|
Brian Behlendorf
|
1b6e81d6a3
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-14 14:39:57 -07:00 |
|
Brian Behlendorf
|
7f1e00e9c4
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:39:46 -07:00 |
|
Brian Behlendorf
|
3b65f6fab8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-14 14:39:38 -07:00 |
|
Brian Behlendorf
|
55e75a2a16
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:39:26 -07:00 |
|
Brian Behlendorf
|
426661d59e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-14 14:39:23 -07:00 |
|
Brian Behlendorf
|
4fdfe52c61
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:39:12 -07:00 |
|
Brian Behlendorf
|
5427e1eec2
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-14 14:39:09 -07:00 |
|
Brian Behlendorf
|
e3a6c69cf6
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:38:57 -07:00 |
|
Brian Behlendorf
|
24f65b670e
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-14 14:38:54 -07:00 |
|
Brian Behlendorf
|
b80af6382c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:38:43 -07:00 |
|
Brian Behlendorf
|
2807f723c1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-14 14:38:39 -07:00 |
|
Brian Behlendorf
|
814f85409e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:38:28 -07:00 |
|
Brian Behlendorf
|
fd76ce37c6
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-14 14:38:23 -07:00 |
|
Brian Behlendorf
|
4063237fae
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:38:13 -07:00 |
|
Brian Behlendorf
|
01ccdae29c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-14 14:38:09 -07:00 |
|
Brian Behlendorf
|
91b1ba7459
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:37:58 -07:00 |
|
Brian Behlendorf
|
a53cbbfb0e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-14 14:37:55 -07:00 |
|
Brian Behlendorf
|
995321461d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:37:39 -07:00 |
|
Brian Behlendorf
|
9ac0bce002
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-14 14:37:35 -07:00 |
|
Brian Behlendorf
|
8cad1faa5c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:37:24 -07:00 |
|
Brian Behlendorf
|
477c7a7281
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-14 14:37:21 -07:00 |
|
Brian Behlendorf
|
9de496cb93
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:37:10 -07:00 |
|
Brian Behlendorf
|
998d11b698
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-14 14:37:05 -07:00 |
|
Brian Behlendorf
|
438a7e63e9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-14 14:37:03 -07:00 |
|
Brian Behlendorf
|
577cf02db7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:36:41 -07:00 |
|
Brian Behlendorf
|
3574c3ff42
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-14 14:36:38 -07:00 |
|
Brian Behlendorf
|
4727a58497
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-14 14:36:36 -07:00 |
|
Brian Behlendorf
|
a142e829bb
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:36:14 -07:00 |
|
Brian Behlendorf
|
bdb57d428a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-14 14:36:11 -07:00 |
|
Brian Behlendorf
|
47060d3c2f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:36:00 -07:00 |
|
Brian Behlendorf
|
c1f0fefdc1
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-14 14:35:57 -07:00 |
|
Brian Behlendorf
|
bf1fa2ce96
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:35:46 -07:00 |
|
Brian Behlendorf
|
563dcb7a96
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-14 14:35:41 -07:00 |
|
Brian Behlendorf
|
4fca36af49
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:35:30 -07:00 |
|
Brian Behlendorf
|
4367207e48
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-14 14:35:27 -07:00 |
|
Brian Behlendorf
|
2b6e42affc
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:35:16 -07:00 |
|
Brian Behlendorf
|
3e3d9c9139
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-14 14:35:13 -07:00 |
|
Brian Behlendorf
|
02bab3a45d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:35:02 -07:00 |
|
Brian Behlendorf
|
8a5ac45c16
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-14 14:34:55 -07:00 |
|
Brian Behlendorf
|
8121895a61
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-14 14:34:44 -07:00 |
|
Brian Behlendorf
|
1abe2b0b12
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-14 14:34:40 -07:00 |
|
Brian Behlendorf
|
fef9a2c571
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-14 14:34:39 -07:00 |
|
Brian Behlendorf
|
9b9f17a585
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-07-14 14:34:37 -07:00 |
|
Brian Behlendorf
|
6923d172c5
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-07-14 14:34:36 -07:00 |
|
Brian Behlendorf
|
605a501311
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-07-14 14:34:35 -07:00 |