Commit Graph

19759 Commits

Author SHA1 Message Date
Brian Behlendorf e75900a103 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:55 -07:00
Brian Behlendorf d860bca64c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 15:37:52 -07:00
Brian Behlendorf 5b56c5f795 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:46 -07:00
Brian Behlendorf e35dc10161 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-14 15:37:44 -07:00
Brian Behlendorf d6eefb7ef1 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:38 -07:00
Brian Behlendorf ec5ef84e8a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 15:37:35 -07:00
Brian Behlendorf 115609a5ce Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:29 -07:00
Brian Behlendorf 11aa5acb59 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 15:37:26 -07:00
Brian Behlendorf 7dd687cb06 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:20 -07:00
Brian Behlendorf f1d30e721b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 15:37:17 -07:00
Brian Behlendorf e796e2a03e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:10 -07:00
Brian Behlendorf efdca3b5bc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 15:37:07 -07:00
Brian Behlendorf 7eadc495c6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:37:05 -07:00
Brian Behlendorf b5ba75f385 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:37:03 -07:00
Brian Behlendorf 7022cf22c3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-14 15:37:02 -07:00
Brian Behlendorf dfe881c0ef Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-06-14 15:37:01 -07:00
Brian Behlendorf 1e7a75049a Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf c8d75a1c9d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf d9f910d423 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 993fa8c15c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 2c95012288 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 3135b5a26a Update gcc-c90 minor updates
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here.  This is one of the downsides of not just having one
big patch stack.
2010-06-14 15:32:54 -07:00
Brian Behlendorf d8e123dc27 Update gcc-unused
Fix new instances or changes in gcc flagged unused code.  These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.
2010-06-14 15:29:48 -07:00
Brian Behlendorf b41463f5e8 Update gcc-invalid-prototypes
Fix new invalid prototypes, typically just a missing void arg.
2010-06-14 15:25:49 -07:00
Brian Behlendorf b320a7bb4b Update gcc-unit
Fix new possibly uninitialized variables according to gcc.
2010-06-14 15:24:20 -07:00
Brian Behlendorf 0a8593375e Update gcc-missing-case
Fix new locations of an incomplete case statement.
2010-06-14 15:19:09 -07:00
Brian Behlendorf 1893aa76ec Update gcc-no-parenthesis
Fix new locations of missing parenthesis according to gcc.
2010-06-14 15:16:41 -07:00
Brian Behlendorf 48bd88f014 Update gcc-c90
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
2010-06-14 15:15:26 -07:00
Brian Behlendorf 8c3a5cf042 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:53 -07:00
Brian Behlendorf e0468f7c37 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-14 14:44:51 -07:00
Brian Behlendorf aaa3323995 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:45 -07:00
Brian Behlendorf c943bd62d4 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 14:44:43 -07:00
Brian Behlendorf a53a9b9e9d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 14:44:42 -07:00
Brian Behlendorf aa9fd429d5 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:33 -07:00
Brian Behlendorf 6b17084f5f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 14:44:31 -07:00
Brian Behlendorf 30069f7c01 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:26 -07:00
Brian Behlendorf a54633ce22 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 14:44:23 -07:00
Brian Behlendorf ebc371433e Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:19 -07:00
Brian Behlendorf 24b9df1ec4 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-14 14:44:16 -07:00
Brian Behlendorf a83566743e Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:11 -07:00
Brian Behlendorf 09c1313761 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-14 14:44:09 -07:00
Brian Behlendorf ef598c1796 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-14 14:44:04 -07:00
Brian Behlendorf db7df545ea Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-14 14:44:02 -07:00
Brian Behlendorf 5ee691c54c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:56 -07:00
Brian Behlendorf d701c42ed6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 14:43:54 -07:00
Brian Behlendorf ea1c777c40 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:49 -07:00
Brian Behlendorf e0ee5701db Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 14:43:46 -07:00
Brian Behlendorf cbe9fd91cb Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:41 -07:00
Brian Behlendorf 47e0108ff6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 14:43:39 -07:00
Brian Behlendorf 884cb149aa Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:33 -07:00