db40127ff5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 16:59:57 -07:00
f28ca65b92
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 16:57:41 -07:00
5387c446cf
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 16:57:41 -07:00
1a58b78499
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-29 16:57:39 -07:00
015677660a
Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch
2010-06-29 16:57:39 -07:00
6f1eda0629
Add configure check for -Wframe-larger-than=<size>
...
It turns out the gcc option -Wframe-larger-than=<size> which I recently
added to the build system is not supported in older versions of gcc.
Since this is just a flag to ensure I keep stack usage under control
I've added a configure check to detect if gcc supports it. If it's
available we use it in the proper places, if it's not we don't.
2010-06-29 16:53:02 -07:00
f20301b41b
Minor fix to ensure tv_depth is there when debugging is disabled.
2010-06-29 16:52:42 -07:00
b7a39f014b
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 14:43:52 -07:00
91f416b497
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 14:41:38 -07:00
3d207a1f0d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 14:41:37 -07:00
ddb3357f4b
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-29 14:41:35 -07:00
b8bafc851f
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-06-29 14:41:35 -07:00
d0ddee3859
Merge commit 'refs/top-bases/fix-stack-ztest' into fix-stack-ztest
2010-06-29 14:41:34 -07:00
213d6423b5
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2010-06-29 14:41:34 -07:00
c366e466e3
Merge commit 'refs/top-bases/fix-stack-traverse_visitbp' into fix-stack-traverse_visitbp
2010-06-29 14:41:32 -07:00
f47cc9aac2
Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch
2010-06-29 14:41:32 -07:00
4b23500c4a
Merge branch 'fix-stack-traverse_impl' into refs/top-bases/fix-branch
2010-06-29 14:41:31 -07:00
490eb4db5c
Merge commit 'refs/top-bases/fix-stack-traverse_impl' into fix-stack-traverse_impl
2010-06-29 14:41:30 -07:00
daef43003b
Merge branch 'fix-stack-vn_open' into refs/top-bases/fix-branch
2010-06-29 14:41:29 -07:00
861af03304
Merge commit 'refs/top-bases/fix-stack-vn_open' into fix-stack-vn_open
2010-06-29 14:41:28 -07:00
33b9043394
Merge branch 'fix-stack-dsl_dataset_destroy' into refs/top-bases/fix-branch
2010-06-29 14:41:27 -07:00
5721f147c5
Merge commit 'refs/top-bases/fix-stack-dsl_dataset_destroy' into fix-stack-dsl_dataset_destroy
2010-06-29 14:41:27 -07:00
46acb1b8d2
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-29 14:41:25 -07:00
50c15019cb
Merge commit 'refs/top-bases/fix-stack-dmu_objset_snapshot' into fix-stack-dmu_objset_snapshot
2010-06-29 14:41:25 -07:00
b8b1c5abb9
Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch
2010-06-29 14:41:24 -07:00
002a52896d
Merge commit 'refs/top-bases/fix-stack-noinline' into fix-stack-noinline
2010-06-29 14:41:23 -07:00
f568df2d32
Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch
2010-06-29 14:41:22 -07:00
89cd45bf85
Merge commit 'refs/top-bases/fix-stack-dsl_deleg_get' into fix-stack-dsl_deleg_get
2010-06-29 14:41:22 -07:00
4e8810b3ff
Merge branch 'fix-stack-dsl_dir_open_spa' into refs/top-bases/fix-branch
2010-06-29 14:41:20 -07:00
fd66f491b4
Merge commit 'refs/top-bases/fix-stack-dsl_dir_open_spa' into fix-stack-dsl_dir_open_spa
2010-06-29 14:41:20 -07:00
eed68d5e3f
Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch
2010-06-29 14:41:19 -07:00
1badbf8463
Merge commit 'refs/top-bases/fix-stack-lzjb' into fix-stack-lzjb
2010-06-29 14:41:18 -07:00
9559cbca21
Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch
2010-06-29 14:41:17 -07:00
ec6656eadc
Merge commit 'refs/top-bases/fix-kstat-xuio' into fix-kstat-xuio
2010-06-29 14:41:17 -07:00
73cf09d2ec
Merge branch 'fix-metaslab' into refs/top-bases/fix-branch
2010-06-29 14:41:16 -07:00
3cddd49624
Merge commit 'refs/top-bases/fix-metaslab' into fix-metaslab
2010-06-29 14:41:15 -07:00
01df3b60cc
Merge branch 'fix-current' into refs/top-bases/fix-branch
2010-06-29 14:41:14 -07:00
92b4f42d0f
Merge commit 'refs/top-bases/fix-current' into fix-current
2010-06-29 14:41:14 -07:00
f41eaa2d5c
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-06-29 14:41:12 -07:00
0f77e365da
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-06-29 14:41:12 -07:00
1c7f88de99
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-06-29 14:41:11 -07:00
07e889a8bd
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-06-29 14:41:10 -07:00
480e61b674
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-06-29 14:41:09 -07:00
89e867fd9b
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-06-29 14:41:09 -07:00
46f99d60e8
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-06-29 14:41:07 -07:00
9f34bbfb4e
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-06-29 14:41:07 -07:00
bd4bf0dd24
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-06-29 14:41:06 -07:00
96332e2f86
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-06-29 14:41:05 -07:00
16c1ad17e9
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-06-29 14:41:03 -07:00
bc23a8b10f
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-06-29 14:41:03 -07:00
Brian Behlendorf