Commit Graph

20137 Commits

Author SHA1 Message Date
Brian Behlendorf 11f7277f9f Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-07-12 10:23:43 -07:00
Brian Behlendorf 8b28b26c2c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-07-12 10:23:36 -07:00
Brian Behlendorf fe8b3c1614 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-07-12 10:23:34 -07:00
Brian Behlendorf bda2f9873f Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-12 10:23:27 -07:00
Brian Behlendorf d1f7e73bd0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-07-12 10:23:25 -07:00
Brian Behlendorf 28bf5d4751 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-07-12 10:23:18 -07:00
Brian Behlendorf e8f81fdc55 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-07-12 10:23:15 -07:00
Brian Behlendorf 220644fcb3 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-07-12 10:23:08 -07:00
Brian Behlendorf 5ae5b68f85 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-07-12 10:23:06 -07:00
Brian Behlendorf 99694a2e81 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-07-12 10:23:05 -07:00
Brian Behlendorf 4b576456c7 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-07-12 10:23:04 -07:00
Brian Behlendorf 930b48bd2c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-07-12 10:23:03 -07:00
Brian Behlendorf b1ac2755a0 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-07-12 10:23:03 -07:00
Brian Behlendorf d134105bba Linux 2.6.34 compat: add_range() symbol collision
The prototype for an add_range() function was added to the kernel
header include/linux/range.h which conflicts with the static
add_range() defined in zfs_fm.c.  To resolve the conflict all
range functions in zfs_fm.c have been prefixed with zei which
is short for the zfs_ecksum_info struct since all of these
functions operate on that base structure.
2010-07-12 10:13:07 -07:00
Brian Behlendorf 9820fd89a4 Explicitly cast sizeof() to avoid format warnings
Simply explicity cast sizeof() to a 'long int' these numbers will
always be small and the removes all ambiguity.
2010-07-12 10:12:19 -07:00
Brian Behlendorf 007b891fc7 Fix -Werror=format-security compiler option
Noticed under Ubuntu kernel builds, there were two instances where
printf() was not called with a "%s" and instread directly printed
the string.  This can potentially result in a crash and is considered
bad form by gcc.  It has been fixed by adding the needed "%s".
2010-07-12 10:11:48 -07:00
Brian Behlendorf 558da36f6b Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-07-02 14:05:01 -07:00
Brian Behlendorf 736230e779 Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-07-02 14:04:58 -07:00
Brian Behlendorf ed2a95f7d4 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-07-02 14:04:52 -07:00
Brian Behlendorf d1c848172a Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-07-02 14:04:49 -07:00
Brian Behlendorf f7bc5d899d Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-07-02 14:04:43 -07:00
Brian Behlendorf 5ab7e5e0e0 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-07-02 14:04:40 -07:00
Brian Behlendorf 285a0e478c Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-07-02 14:04:34 -07:00
Brian Behlendorf a5e80283bd Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-07-02 14:04:32 -07:00
Brian Behlendorf f13b0fd952 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-07-02 14:04:25 -07:00
Brian Behlendorf bf89df82e4 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-07-02 14:04:23 -07:00
Brian Behlendorf 4a77d84c9e Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-07-02 14:04:17 -07:00
Brian Behlendorf b84fd528c3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-07-02 14:04:14 -07:00
Brian Behlendorf 85e0131726 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-07-02 14:04:07 -07:00
Brian Behlendorf 1c3e127596 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-07-02 14:04:05 -07:00
Brian Behlendorf 696f063a9a Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:58 -07:00
Brian Behlendorf f816b9db6d Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-07-02 14:03:56 -07:00
Brian Behlendorf 6d96a18295 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:49 -07:00
Brian Behlendorf a2507275af Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-07-02 14:03:47 -07:00
Brian Behlendorf 9099c8ba1d Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:41 -07:00
Brian Behlendorf 5a1fb48e54 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-07-02 14:03:38 -07:00
Brian Behlendorf 708d7adbc8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:32 -07:00
Brian Behlendorf 69b3282799 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-07-02 14:03:30 -07:00
Brian Behlendorf dbdfde3d21 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:22 -07:00
Brian Behlendorf b17ca5c674 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-07-02 14:03:20 -07:00
Brian Behlendorf 1626b66785 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:13 -07:00
Brian Behlendorf 99fead1822 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-07-02 14:03:11 -07:00
Brian Behlendorf d1f0255667 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-07-02 14:03:04 -07:00
Brian Behlendorf ea39046f41 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-07-02 14:03:02 -07:00
Brian Behlendorf 6dff3d475a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-07-02 14:02:55 -07:00
Brian Behlendorf d46db3a397 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-07-02 14:02:53 -07:00
Brian Behlendorf 5b646b38b3 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-02 14:02:46 -07:00
Brian Behlendorf d7e916a68f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-07-02 14:02:44 -07:00
Brian Behlendorf 9aeda80e48 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-07-02 14:02:37 -07:00
Brian Behlendorf eadcc7288a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-07-02 14:02:34 -07:00