Brian Behlendorf
8481c9b7bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-02 15:29:28 -07:00
Brian Behlendorf
aa54b2619c
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-02 15:29:28 -07:00
Brian Behlendorf
7e9bdac1a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-02 15:29:27 -07:00
Brian Behlendorf
8bf0a4e79c
Merge branch 'fix-stack-inline' into refs/top-bases/fix-branch
2010-08-02 15:29:25 -07:00
Brian Behlendorf
78798f0ea5
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-02 15:29:25 -07:00
Brian Behlendorf
45c00bf359
Fix spa_load_impl() prototype
...
Both the forward declaration of spa_load_impl() and the actual
function declaration must match.
2010-08-02 15:24:33 -07:00
Brian Behlendorf
52c23142d4
Revert "Inline zio_execute() to reduce stack use"
...
This reverts commit 411dd65af1
.
gcc version 4.1.2 does not like having differing prototypes
for zio_execute, one version in the .c with inline and one
version in the .h without. Thus I'm reverting this change
and we'll see how critical this particular stack reduction is.
2010-08-02 15:22:11 -07:00
Brian Behlendorf
8327e0cebb
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:52 -07:00
Brian Behlendorf
d0be3ff424
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-02 14:19:50 -07:00
Brian Behlendorf
82a32942aa
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:44 -07:00
Brian Behlendorf
d19606b3d9
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-02 14:19:42 -07:00
Brian Behlendorf
efb7989c99
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:36 -07:00
Brian Behlendorf
09091268f8
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-02 14:19:34 -07:00
Brian Behlendorf
f151fd6bec
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:28 -07:00
Brian Behlendorf
c46c573c09
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-02 14:19:26 -07:00
Brian Behlendorf
07956bf3ff
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:20 -07:00
Brian Behlendorf
32614eacbe
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-02 14:19:18 -07:00
Brian Behlendorf
ba72fc9d23
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:11 -07:00
Brian Behlendorf
d4f9acb30f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-02 14:19:09 -07:00
Brian Behlendorf
762b71ffdc
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-02 14:19:03 -07:00
Brian Behlendorf
ea05fed9e0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-02 14:19:01 -07:00
Brian Behlendorf
3a14c30a9f
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:54 -07:00
Brian Behlendorf
7b6af1abdc
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-02 14:18:52 -07:00
Brian Behlendorf
4767fb66fa
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:45 -07:00
Brian Behlendorf
ba496c4f9a
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-02 14:18:43 -07:00
Brian Behlendorf
83baa8417c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:37 -07:00
Brian Behlendorf
edfb44a213
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-02 14:18:34 -07:00
Brian Behlendorf
3053450c83
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:28 -07:00
Brian Behlendorf
3940a8590a
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-02 14:18:26 -07:00
Brian Behlendorf
d8c69fa656
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:20 -07:00
Brian Behlendorf
1cfc7c351c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-02 14:18:18 -07:00
Brian Behlendorf
b8ff045248
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:12 -07:00
Brian Behlendorf
2722aaa988
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-02 14:18:10 -07:00
Brian Behlendorf
3c31101e61
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-02 14:18:04 -07:00
Brian Behlendorf
18b4ce52b7
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-02 14:18:01 -07:00
Brian Behlendorf
8e4eefe499
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-02 14:17:55 -07:00
Brian Behlendorf
af8f44b83d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-02 14:17:53 -07:00
Brian Behlendorf
0af17a9105
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-02 14:17:47 -07:00
Brian Behlendorf
9eb75e62cf
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-02 14:17:45 -07:00
Brian Behlendorf
d11fed28e3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-02 14:17:38 -07:00
Brian Behlendorf
bd4701a061
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-02 14:17:36 -07:00
Brian Behlendorf
f83b6d1506
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-02 14:17:29 -07:00
Brian Behlendorf
8785edb158
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-02 14:17:27 -07:00
Brian Behlendorf
472cba82e2
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-02 14:17:21 -07:00
Brian Behlendorf
ec938f6a26
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-02 14:17:18 -07:00
Brian Behlendorf
1afa38755a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-02 14:17:17 -07:00
Brian Behlendorf
3de149b962
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-02 14:17:16 -07:00
Brian Behlendorf
74fdd957d1
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-02 14:12:56 -07:00
Brian Behlendorf
529d515858
Merge branch 'fix-stack-dbuf_hold_impl' into refs/top-bases/fix-branch
2010-08-02 14:12:55 -07:00
Brian Behlendorf
f271befe26
New TopGit dependency: fix-stack-dbuf_hold_impl
2010-08-02 14:12:52 -07:00