371fdb5cf2
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 11:36:54 -07:00
2a8d4a222b
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:49 -07:00
8f412fc1a7
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 11:36:46 -07:00
9334025a81
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:40 -07:00
9f76710853
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-29 11:36:38 -07:00
9921bb4925
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:32 -07:00
b2fa7c143c
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 11:36:30 -07:00
c739e95948
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:24 -07:00
129d7fe78a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-29 11:36:21 -07:00
3c1022228a
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:15 -07:00
9fddfa2212
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 11:36:13 -07:00
471ad9740e
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-29 11:36:07 -07:00
00a1ab0d45
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-29 11:36:05 -07:00
d112857f2a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:58 -07:00
43088d22ad
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-29 11:35:56 -07:00
beb53b1fd5
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:50 -07:00
b14dd35481
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-29 11:35:48 -07:00
aa8c3e5be7
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:42 -07:00
e197568e59
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-29 11:35:40 -07:00
a6896d0b11
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:33 -07:00
f1de1c960e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 11:35:31 -07:00
e809129f7e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:25 -07:00
36ef3e92c2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-29 11:35:22 -07:00
3256a1be14
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:16 -07:00
8f720e3815
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-29 11:35:14 -07:00
042e369140
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-29 11:35:08 -07:00
dfc2583bcf
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-29 11:35:05 -07:00
d69d0b213d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 11:34:59 -07:00
4851f79bf1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-29 11:34:56 -07:00
f87bfdf6b0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-29 11:34:50 -07:00
eb01fe35c6
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-29 11:34:48 -07:00
8af57a28ce
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-29 11:34:42 -07:00
5c0cbee2f3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-29 11:34:39 -07:00
5fd2bd24a7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 11:34:38 -07:00
a0796cadf7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-06-29 11:34:31 -07:00
ed1d1a7957
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-29 11:28:37 -07:00
0efc05dd6f
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-06-29 11:28:36 -07:00
865478a113
Update dependency fix-pthreads changes to fix-stack-ztest
...
This was done becaese fix-stack-ztest was added to the stack
in series after fix-pthreads because fix-stack-ztest depends
on many of the pthreads changes.
2010-06-29 11:27:33 -07:00
ef01098ef4
Reduce stack used by ztest
...
While ztest does run in user space we run it with the same stack
restrictions it would have in kernel space. This ensures that any
stack related issues which would be hit in the kernel can be caught
and debugged in user space instead.
This patch is a first pass to limit the stack usage of every ztest
function to 1024 bytes. Subsequent updates can further reduce this
2010-06-29 11:25:08 -07:00
eed002ed41
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-29 11:14:23 -07:00
a19df13637
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-29 11:14:20 -07:00
53d4a1d1db
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-29 11:14:15 -07:00
54f351767b
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 11:14:13 -07:00
7f8ffad52e
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-29 11:14:07 -07:00
4b345dd860
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 11:14:05 -07:00
720a0a8449
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-29 11:13:59 -07:00
a5d3994e26
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-29 11:13:57 -07:00
c2d4a3ca84
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-29 11:13:51 -07:00
4e8b0b7409
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 11:13:48 -07:00
48974be14f
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-29 11:13:43 -07:00
Brian Behlendorf