The patch titled strlcpy is smart enough has been added to the -mm tree. Its filename is ehea-strlcpy-is-smart-enough.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: strlcpy is smart enough From: Jean Delvare <khali@xxxxxxxxxxxx> strlcpy already accounts for the trailing zero in its length computation, so there is no need to substract one to the buffer size. Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx> Cc: Jan-Bernd Themann <themann@xxxxxxxxxx> Cc: Thomas Klein <osstklei@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/ehea/ehea_ethtool.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/net/ehea/ehea_ethtool.c~ehea-strlcpy-is-smart-enough drivers/net/ehea/ehea_ethtool.c --- a/drivers/net/ehea/ehea_ethtool.c~ehea-strlcpy-is-smart-enough +++ a/drivers/net/ehea/ehea_ethtool.c @@ -144,8 +144,8 @@ static int ehea_nway_reset(struct net_de static void ehea_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strlcpy(info->driver, DRV_NAME, sizeof(info->driver) - 1); - strlcpy(info->version, DRV_VERSION, sizeof(info->version) - 1); + strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); + strlcpy(info->version, DRV_VERSION, sizeof(info->version)); } static u32 ehea_get_msglevel(struct net_device *dev) _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are origin.patch git-dvb.patch scatterlisth-needs-typesh.patch cleanup-the-includes-of-linux-pcih.patch s390-strlcpy-is-smart-enough.patch sound-strlcpy-is-smart-enough.patch oss-strlcpy-is-smart-enough.patch xtensa-strlcpy-is-smart-enough.patch ehea-strlcpy-is-smart-enough.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html