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

> On May 28, 2020, at 8:59 PM, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the nfsd tree got a conflict in: > > include/trace/events/sunrpc.h > > between commit: > > 2baebf955125 ("SUNRPC: Split the xdr_buf event class") > > from the nfs-anna tree and commit: > >

linux-next: manual merge of the nfsd tree with the nfs-anna tree

Hi all, Today's linux-next merge of the nfsd tree got a conflict in: net/sunrpc/svc_xprt.c between commit: 2baebf955125 ("SUNRPC: Split the xdr_buf event class") from the nfs-anna tree and commit: ca4faf543a33 ("SUNRPC: Move xpt_mutex into socket xpo_sendto methods") from the nfsd tree

linux-next: manual merge of the nfsd tree with the nfs-anna tree

Hi all, Today's linux-next merge of the nfsd tree got a conflict in: include/trace/events/sunrpc.h between commit: 2baebf955125 ("SUNRPC: Split the xdr_buf event class") from the nfs-anna tree and commit: 998024dee197 ("SUNRPC: Add more svcsock tracepoints") from the nfsd tree. I fixe