Brian Behlendorf
f254c7982b
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:45 -07:00
Brian Behlendorf
18ead3a526
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:44:43 -07:00
Brian Behlendorf
502ec26405
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:37 -07:00
Brian Behlendorf
b5e1e3ade4
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-16 14:44:35 -07:00
Brian Behlendorf
58dcc97a9a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:30 -07:00
Brian Behlendorf
a90a714a54
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-16 14:44:28 -07:00
Brian Behlendorf
9c0e5c2031
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:23 -07:00
Brian Behlendorf
e1e1910155
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-16 14:44:21 -07:00
Brian Behlendorf
6b4c942750
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:15 -07:00
Brian Behlendorf
c153a79adc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-16 14:44:13 -07:00
Brian Behlendorf
098a212ea3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:07 -07:00
Brian Behlendorf
67c6255292
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 14:44:05 -07:00
Brian Behlendorf
fc3b5bf493
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:00 -07:00
Brian Behlendorf
3f67a34204
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-16 14:43:58 -07:00
Brian Behlendorf
b5a9282fd8
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:52 -07:00
Brian Behlendorf
68f12c3c0d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-16 14:43:50 -07:00
Brian Behlendorf
fff91ade60
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:45 -07:00
Brian Behlendorf
76ad38b271
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 14:43:43 -07:00
Brian Behlendorf
4c3864ba2b
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:37 -07:00
Brian Behlendorf
4aba89bb16
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 14:43:35 -07:00
Brian Behlendorf
0c051a50fe
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:29 -07:00
Brian Behlendorf
4af4558675
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 14:43:26 -07:00
Brian Behlendorf
8645a8e901
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:21 -07:00
Brian Behlendorf
ca3849d1ce
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-16 14:43:18 -07:00
Brian Behlendorf
2f457b7bd0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 14:43:17 -07:00
Brian Behlendorf
8de2671680
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 14:43:17 -07:00
Brian Behlendorf
a0c72bab76
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-16 14:39:41 -07:00
Brian Behlendorf
6504afae4a
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-16 14:39:41 -07:00
Brian Behlendorf
bf02bcb6ee
New TopGit dependency: fix-stack-dmu_objset_snapshot
2010-06-16 14:39:39 -07:00
Brian Behlendorf
e163b08ba3
Add fix-stack-dmu_objset_snapshot topic branch
...
Reduce stack usage by 276 bytes by moving the snaparg struct from the
stack to the heap. We have limited stack space we must not waste.
2010-06-16 14:39:06 -07:00
Brian Behlendorf
a2ba5b83f8
Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch
2010-06-16 14:35:14 -07:00
Brian Behlendorf
94a22f54e5
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-16 14:35:14 -07:00
Brian Behlendorf
23d291df44
New TopGit dependency: fix-stack-noinline
2010-06-16 14:35:11 -07:00
Brian Behlendorf
bbdb8184ec
Add fix-stack-noinline topic branch
...
Certain function must never be automatically inlined by gcc because
they are stack heavy or called recursively. This patch flags all
such functions I have found as 'noinline' to prevent gcc from making
the optimization.
2010-06-16 14:34:41 -07:00
Brian Behlendorf
d297febad2
Remove fix-stack dependency from fix-branch
2010-06-16 14:30:40 -07:00
Brian Behlendorf
3cfae229ef
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 14:29:49 -07:00
Brian Behlendorf
e8241aaa36
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-16 14:29:47 -07:00
Brian Behlendorf
bcbce917f7
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-16 14:29:41 -07:00
Brian Behlendorf
0e0554e504
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-16 14:29:39 -07:00
Brian Behlendorf
36ffad837a
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 14:29:34 -07:00
Brian Behlendorf
80de599c38
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-16 14:29:31 -07:00
Brian Behlendorf
6f47dbb248
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-16 14:29:26 -07:00
Brian Behlendorf
ede85e5c3c
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-16 14:29:24 -07:00
Brian Behlendorf
45bc58c04d
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-16 14:29:19 -07:00
Brian Behlendorf
f956c97dc3
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:29:17 -07:00
Brian Behlendorf
f83c9f790e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:29:16 -07:00
Brian Behlendorf
7305ce1ae0
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 14:29:07 -07:00
Brian Behlendorf
9513d614a5
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:29:05 -07:00
Brian Behlendorf
407f96f72e
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-16 14:28:59 -07:00
Brian Behlendorf
29df979686
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:28:57 -07:00