d04b8e9fa2
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:45 -07:00
3a9c2a23b7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-20 10:25:43 -07:00
c7068a5d76
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:20 -07:00
588a449812
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-20 10:25:18 -07:00
36ac8a77d5
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 10:24:54 -07:00
da41056e9b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-20 10:24:52 -07:00
f935d72383
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-20 10:24:29 -07:00
2f5167889f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-20 10:24:27 -07:00
c6ea865e3a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-20 10:24:05 -07:00
3e49f384a3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-20 10:24:02 -07:00
4ae64a8acd
Move from kmem_alloc() to vmem_alloc().
...
These two allocations are 16k in size which trips the SPL warning
about large kmem_allocs(). For now simply shift them to a vmem_alloc().
Yes, this has it's own set of problems but this happens infrequently
enough not to be a real issue. But more importantly it means that
we've flagged this place in the code via this topic branch as a
place which still needs long term work.
2010-05-20 10:06:32 -07:00
b50494ba2d
Add missing header observed after linux-legacy was reverted.
...
Interestingly this has only been a problem on a clean RHEL6
install so I suspect the include was removed from one of the
standard system include headers. We should be including it
explicitly anyway since it's used in both of these .c files.
2010-05-20 10:04:10 -07:00
b974e4bf4d
Fix error message to reference the new libuuid package.
...
It used to be the case that libuuid was part of e2fsprogs. However,
since other projects unrelated to e2fsprogs make use of that library
it was getting aukward to have that dependency. The package was
split from e2fsprogs and moved to its own devel package in the
util-linux-ng project. Anyway, I'm just updating the error message
to reflect the new upstream reality.
2010-05-20 10:00:03 -07:00
9929ffdec4
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:55 -07:00
d5941b4c3d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 16:24:53 -07:00
f02ff65e3f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 16:24:53 -07:00
16353c430c
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:39 -07:00
0ffb7b7f40
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 16:24:37 -07:00
925daf0aa0
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:29 -07:00
2542a0e437
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 16:24:27 -07:00
21c8a76e8f
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:20 -07:00
408bd6685e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 16:24:18 -07:00
c285e30967
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:11 -07:00
642009ca1d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 16:24:09 -07:00
b7e3c8dda1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 16:24:01 -07:00
dc00ab7bf4
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 16:23:59 -07:00
14524baddc
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:52 -07:00
470e2e5c70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 16:23:50 -07:00
6ae0735fbe
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:42 -07:00
ad78a7f826
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 16:23:41 -07:00
d0fb672d5b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:33 -07:00
ac21bd7c44
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-18 16:23:31 -07:00
85b46f9020
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:23 -07:00
0aa6aae489
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 16:23:21 -07:00
c79ca8d2e6
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:14 -07:00
91979ad8ff
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-18 16:23:12 -07:00
3aa78bb832
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 16:23:04 -07:00
f091b86fdb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 16:23:03 -07:00
472a2e0114
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-18 16:22:55 -07:00
1f47cacf55
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-18 16:22:53 -07:00
437789841d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 16:22:46 -07:00
3300354e08
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-18 16:22:44 -07:00
d28ada9eaa
Remove explicit import from zconfig test 1.
...
Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load. Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.
2010-05-18 16:15:57 -07:00
e19dec32a7
Minor fix from linux-legacy branch.
...
Fold in a minor fix from the removed linux-legacy branch to skip checking
character devices in /dev/ during import. Under Linux pread() may simply
block when reading from these devices causing the import to hang.
2010-05-18 16:13:10 -07:00
c287454d78
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:51 -07:00
742562df13
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 15:13:49 -07:00
f52c20273b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 15:13:48 -07:00
cda88c79cb
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:33 -07:00
350d1a44f9
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 15:13:31 -07:00
1aeb83feb9
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:24 -07:00
Brian Behlendorf