Commit Graph

20186 Commits

Author SHA1 Message Date
Brian Behlendorf 35ec3dbb0e Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-29 16:59:13 -07:00
Brian Behlendorf a936f3e20d Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-29 16:59:06 -07:00
Brian Behlendorf 4ce820b17f Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-29 16:59:04 -07:00
Brian Behlendorf b151e02302 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:58 -07:00
Brian Behlendorf 3fdd303b62 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-29 16:58:55 -07:00
Brian Behlendorf 030768a566 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:49 -07:00
Brian Behlendorf c5afb06a83 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-29 16:58:47 -07:00
Brian Behlendorf aebb93bc27 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:40 -07:00
Brian Behlendorf 68a2ae2594 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-29 16:58:37 -07:00
Brian Behlendorf 01c10a9183 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:30 -07:00
Brian Behlendorf 2645596d71 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-29 16:58:28 -07:00
Brian Behlendorf 7e13395a80 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:21 -07:00
Brian Behlendorf 382f1c338c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-29 16:58:19 -07:00
Brian Behlendorf c3f4fc5172 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:13 -07:00
Brian Behlendorf 3b0e8e41d1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-29 16:58:10 -07:00
Brian Behlendorf dd1d1076e4 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-29 16:58:04 -07:00
Brian Behlendorf f5cb411fc1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-29 16:58:01 -07:00
Brian Behlendorf 34fd2700f8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-29 16:57:54 -07:00
Brian Behlendorf 068b74a60e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-29 16:57:52 -07:00
Brian Behlendorf 9c4837d5da Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-29 16:57:45 -07:00
Brian Behlendorf 468392fcc7 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-29 16:57:42 -07:00
Brian Behlendorf 5387c446cf Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 16:57:41 -07:00
Brian Behlendorf f28ca65b92 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-29 16:57:41 -07:00
Brian Behlendorf 1a58b78499 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-29 16:57:39 -07:00
Brian Behlendorf 015677660a Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch 2010-06-29 16:57:39 -07:00
Brian Behlendorf 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
Brian Behlendorf f20301b41b Minor fix to ensure tv_depth is there when debugging is disabled. 2010-06-29 16:52:42 -07:00
Brian Behlendorf 4139db89b0 Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-06-29 14:44:11 -07:00
Brian Behlendorf 13da5faf3d Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-06-29 14:44:09 -07:00
Brian Behlendorf 6bff7cf703 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-06-29 14:44:03 -07:00
Brian Behlendorf 22b49f9fed Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-06-29 14:44:00 -07:00
Brian Behlendorf 5edec9acc8 Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:54 -07:00
Brian Behlendorf b7a39f014b Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-06-29 14:43:52 -07:00
Brian Behlendorf 526421564d Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:46 -07:00
Brian Behlendorf 5ff61a53e0 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-29 14:43:43 -07:00
Brian Behlendorf 0089297711 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:36 -07:00
Brian Behlendorf e9d7f4ae7c Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-29 14:43:34 -07:00
Brian Behlendorf e96d6fc50c Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:28 -07:00
Brian Behlendorf 3d21b3aae0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-29 14:43:25 -07:00
Brian Behlendorf 6b993d24b6 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:19 -07:00
Brian Behlendorf 94b655068c Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-29 14:43:16 -07:00
Brian Behlendorf 75dc55c205 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:10 -07:00
Brian Behlendorf 703d73e4c5 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-29 14:43:08 -07:00
Brian Behlendorf 2a1a8ac7cd Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-29 14:43:01 -07:00
Brian Behlendorf 79ca2adb37 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-29 14:42:59 -07:00
Brian Behlendorf fdc28dba44 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-29 14:42:52 -07:00
Brian Behlendorf 8e17d1bbe5 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-29 14:42:50 -07:00
Brian Behlendorf d39f451215 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-29 14:42:43 -07:00
Brian Behlendorf 24e82e404e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-29 14:42:41 -07:00
Brian Behlendorf b4b3db5828 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-29 14:42:35 -07:00