Subject: Re: linux-next: manual merge of the net-next tree with the nfsd tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 5 Jun 2020 10:46:26 +1000

Hi all,

On Fri, 29 May 2020 13:19:55 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   net/sunrpc/svcsock.c
> 
> between commits:
> 
>   11bbb0f76e99 ("SUNRPC: Trace a few more generic svc_xprt events")
>   998024dee197 ("SUNRPC: Add more svcsock tracepoints")
> 
> from the nfsd tree and commits:
> 
>   9b115749acb2 ("ipv6: add ip6_sock_set_v6only")
>   7d7207c2d570 ("ipv6: add ip6_sock_set_recvpktinfo")
> 
> from the net-next tree.
> 
> 
> diff --cc net/sunrpc/svcsock.c
> index 97d2b6f8c791,e7a0037d9b56..000000000000
> --- a/net/sunrpc/svcsock.c
> +++ b/net/sunrpc/svcsock.c
> @@@ -1357,7 -1322,11 +1343,6 @@@ static struct svc_xprt *svc_create_sock
>   	struct sockaddr *newsin = (struct sockaddr *)&addr;
>   	int		newlen;
>   	int		family;
> - 	int		val;
>  -	RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
>  -
>  -	dprintk("svc: svc_create_socket(%s, %d, %s)\n",
>  -			serv->sv_program->pg_name, protocol,
>  -			__svc_print_addr(sin, buf, sizeof(buf)));
>   
>   	if (protocol != IPPROTO_UDP && protocol != IPPROTO_TCP) {
>   		printk(KERN_WARNING "svc: only UDP and TCP "

This is now a conflict between the nfsd tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell