138205187e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:07 -07:00
99ffebbafd
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-12 10:25:05 -07:00
3f8b24c193
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:58 -07:00
5b93e8041c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-12 10:24:56 -07:00
89d1064966
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:48 -07:00
97bf94e219
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-12 10:24:46 -07:00
a0b6b3bcbc
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:40 -07:00
dbae106f8c
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-12 10:24:37 -07:00
03ec040e81
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:31 -07:00
25af873dbc
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-12 10:24:28 -07:00
28932c2e69
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:22 -07:00
9e48a20559
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-12 10:24:19 -07:00
3ffedb70e4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:13 -07:00
3d6001c10b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-12 10:24:11 -07:00
2c03b4439a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:04 -07:00
7b61b3bb6a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-12 10:24:01 -07:00
8f7a171fc8
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-12 10:23:55 -07:00
b5f7613698
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-12 10:23:52 -07:00
97635d5c18
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-12 10:23:46 -07:00
11f7277f9f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-12 10:23:43 -07:00
8b28b26c2c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-12 10:23:36 -07:00
fe8b3c1614
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-12 10:23:34 -07:00
bda2f9873f
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-12 10:23:27 -07:00
d1f7e73bd0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-12 10:23:25 -07:00
28bf5d4751
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-12 10:23:18 -07:00
e8f81fdc55
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-12 10:23:15 -07:00
220644fcb3
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-12 10:23:08 -07:00
5ae5b68f85
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-12 10:23:06 -07:00
99694a2e81
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-12 10:23:05 -07:00
4b576456c7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-07-12 10:23:04 -07:00
930b48bd2c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-07-12 10:23:03 -07:00
b1ac2755a0
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-07-12 10:23:03 -07:00
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
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
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
558da36f6b
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-02 14:05:01 -07:00
736230e779
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-02 14:04:58 -07:00
ed2a95f7d4
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:52 -07:00
d1c848172a
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-02 14:04:49 -07:00
f7bc5d899d
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:43 -07:00
5ab7e5e0e0
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-02 14:04:40 -07:00
285a0e478c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:34 -07:00
a5e80283bd
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-02 14:04:32 -07:00
f13b0fd952
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:25 -07:00
bf89df82e4
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-02 14:04:23 -07:00
4a77d84c9e
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:17 -07:00
b84fd528c3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-02 14:04:14 -07:00
85e0131726
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:07 -07:00
1c3e127596
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-02 14:04:05 -07:00
696f063a9a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:58 -07:00
Brian Behlendorf