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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200529131955.26c421db@canb.auug.org.au>
Date:   Fri, 29 May 2020 13:19:55 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        "J. Bruce Fields" <bfields@...ldses.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>,
        Chuck Lever <chuck.lever@...cle.com>
Subject: linux-next: manual merge of the net-next tree with the nfsd tree

Hi all,

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.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

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 "

Content of type "application/pgp-signature" skipped