Hi all,

On Mon, 14 Dec 2020 13:14:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/cifs/cifs_swn.c: In function 'cifs_swn_notify':
> fs/cifs/cifs_swn.c:450:4: error: implicit declaration of function 'nla_strlcpy'; did you mean 'nla_strscpy'? [-Werror=implicit-function-declaration]
>   450 |    nla_strlcpy(name, info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_NAME],
>       |    ^~~~~~~~~~~
>       |    nla_strscpy
> 
> Caused by commit
> 
>   872f69034194 ("treewide: rename nla_strlcpy to nla_strscpy.")
> 
> interacting with commit
> 
>   27228d73f4d2 ("cifs: Set witness notification handler for messages from userspace daemon")
> 
> from the cifs tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 14 Dec 2020 13:09:27 +1100
> Subject: [PATCH] fixup for "treewide: rename nla_strlcpy to nla_strscpy."
> 
> conflicting with
> 
> "cifs: Set witness notification handler for messages from userspace daemon"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/cifs/cifs_swn.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/cifs/cifs_swn.c b/fs/cifs/cifs_swn.c
> index 642c9eedc8ab..d762d442dfa5 100644
> --- a/fs/cifs/cifs_swn.c
> +++ b/fs/cifs/cifs_swn.c
> @@ -447,7 +447,7 @@ int cifs_swn_notify(struct sk_buff *skb, struct genl_info *info)
>  		int state;
>  
>  		if (info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_NAME]) {
> -			nla_strlcpy(name, info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_NAME],
> +			nla_strscpy(name, info->attrs[CIFS_GENL_ATTR_SWN_RESOURCE_NAME],
>  					sizeof(name));
>  		} else {
>  			cifs_dbg(FYI, "%s: missing resource name attribute\n", __func__);

This fixup is now needed when the cifs tree is merged with Linus' tree.

-- 
Cheers,
Stephen Rothwell