2baf884f11
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:42 -08:00
c756556476
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-12-18 14:32:41 -08:00
fd2e3e4ff9
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-12-18 14:32:35 -08:00
955475707b
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:35 -08:00
cbafee6ff0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-18 14:32:29 -08:00
a5b2a55b7d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:29 -08:00
70f8b829a5
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-12-18 14:32:23 -08:00
0f4d84ea15
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:23 -08:00
10799d975e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-18 14:32:17 -08:00
f24cf1886c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:17 -08:00
e011449a93
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-12-18 14:32:11 -08:00
ae0ceba275
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:11 -08:00
25ecf0dd97
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-12-18 14:32:05 -08:00
7a9d4b1411
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:05 -08:00
a058af7146
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:59 -08:00
05952b960d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-12-18 14:31:58 -08:00
85bfabd8c3
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:52 -08:00
08571cee27
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-12-18 14:31:51 -08:00
5b0a1c06d5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-12-18 14:31:51 -08:00
3c4ffd1630
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:42 -08:00
cf03fd9f4c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-12-18 14:31:41 -08:00
163865cf1e
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:36 -08:00
4c90aaeffb
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-12-18 14:31:35 -08:00
fcdc7ae52d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-12-18 14:31:30 -08:00
204cc300e6
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:30 -08:00
8ffe347acc
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:23 -08:00
93b5403a64
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-18 14:31:22 -08:00
e8ca8faa51
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-18 14:31:22 -08:00
1a36b0ada1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-18 14:31:22 -08:00
f00925c9c0
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-12-18 14:31:21 -08:00
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
70ddc1393f
No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
...
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called. Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
0f7d7ced78
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-12-11 16:54:03 -08:00
1c1241370a
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-12-11 16:54:01 -08:00
cb3f80005f
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:56 -08:00
c98963d056
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-12-11 16:53:54 -08:00
3fb1c139c7
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:49 -08:00
b104e63fb8
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-12-11 16:53:47 -08:00
d3bd944282
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:42 -08:00
61af72bb29
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-12-11 16:53:41 -08:00
72f813dd02
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:35 -08:00
65a9ad7d43
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 16:53:33 -08:00
6b38abbbbf
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:28 -08:00
2705ee6ac0
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-12-11 16:53:26 -08:00
1c6feb65ab
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:21 -08:00
36f04a1dd4
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-11 16:53:19 -08:00
f8e48c9cb6
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:14 -08:00
0cba1b87c9
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-12-11 16:53:12 -08:00
88f636af98
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-12-11 16:53:07 -08:00
6b87cf4fce
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-12-11 16:53:05 -08:00
Brian Behlendorf