b4fa1a9544
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-29 17:00:20 -07:00
d8c228876e
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-29 17:00:18 -07:00
5ad3f6ea67
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-29 17:00:17 -07:00
a1e5e45bee
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-29 17:00:14 -07:00
f0a4567ce8
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-29 17:00:08 -07:00
7f1ede8798
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 17:00:06 -07:00
11f9cf3e45
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:59 -07:00
db40127ff5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 16:59:57 -07:00
797fbfe0b4
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:51 -07:00
efb8087778
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-29 16:59:48 -07:00
7bf775d1a1
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:42 -07:00
e983ee681f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 16:59:40 -07:00
1356ca190c
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:33 -07:00
ef488d53dd
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-29 16:59:31 -07:00
daa053cee7
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:24 -07:00
f1f5c3783c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 16:59:22 -07:00
7029543864
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:15 -07:00
35ec3dbb0e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-29 16:59:13 -07:00
a936f3e20d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:06 -07:00
4ce820b17f
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-29 16:59:04 -07:00
b151e02302
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:58 -07:00
3fdd303b62
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-29 16:58:55 -07:00
030768a566
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:49 -07:00
c5afb06a83
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-29 16:58:47 -07:00
aebb93bc27
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:40 -07:00
68a2ae2594
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 16:58:37 -07:00
01c10a9183
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:30 -07:00
2645596d71
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-29 16:58:28 -07:00
7e13395a80
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:21 -07:00
382f1c338c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-29 16:58:19 -07:00
c3f4fc5172
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:13 -07:00
3b0e8e41d1
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-29 16:58:10 -07:00
dd1d1076e4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:04 -07:00
f5cb411fc1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-29 16:58:01 -07:00
34fd2700f8
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-29 16:57:54 -07:00
068b74a60e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-29 16:57:52 -07:00
9c4837d5da
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-29 16:57:45 -07:00
468392fcc7
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-29 16:57:42 -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
3452410770
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-29 14:44:15 -07:00
6195cd1530
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-29 14:44:13 -07:00
4139db89b0
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-29 14:44:11 -07:00
13da5faf3d
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-29 14:44:09 -07:00
6bff7cf703
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-29 14:44:03 -07:00
22b49f9fed
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 14:44:00 -07:00
Brian Behlendorf