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

Hi all, On Fri, 29 May 2020 13:19:55 +1000 Stephen Rothwell 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 s

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: a