* linux-next: manual merge of the net-next tree with the nfsd tree
@ 2020-05-29 3:19 Stephen Rothwell
2020-06-05 0:46 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-05-29 3:19 UTC (permalink / raw)
To: David Miller, Networking, J. Bruce Fields
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Christoph Hellwig, Chuck Lever
[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]
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 "
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the nfsd tree
2020-05-29 3:19 linux-next: manual merge of the net-next tree with the nfsd tree Stephen Rothwell
@ 2020-06-05 0:46 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-06-05 0:46 UTC (permalink / raw)
To: David Miller, Networking, J. Bruce Fields
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Christoph Hellwig, Chuck Lever
[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]
Hi all,
On Fri, 29 May 2020 13:19:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-05 0:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-29 3:19 linux-next: manual merge of the net-next tree with the nfsd tree Stephen Rothwell
2020-06-05 0:46 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).