From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
"J. Bruce Fields" <bfields@fieldses•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>,
Chuck Lever <chuck.lever@oracle•com>
Subject: Re: linux-next: manual merge of the net-next tree with the nfsd tree
Date: Fri, 5 Jun 2020 10:46:26 +1000 [thread overview]
Message-ID: <20200605104626.4969f897@canb.auug.org.au> (raw)
In-Reply-To: <20200529131955.26c421db@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2020-06-05 0:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605104626.4969f897@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bfields@fieldses$(echo .)org \
--cc=chuck.lever@oracle$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox