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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 29 May 2020 10:59:17 +1000

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 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 include/trace/events/sunrpc.h
index 73193c79fcaa,852413cbb7d9..000000000000
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -14,9 -14,41 +14,42 @@@
  #include <linux/net.h>
  #include <linux/tracepoint.h>
  
+ TRACE_DEFINE_ENUM(SOCK_STREAM);
+ TRACE_DEFINE_ENUM(SOCK_DGRAM);
+ TRACE_DEFINE_ENUM(SOCK_RAW);
+ TRACE_DEFINE_ENUM(SOCK_RDM);
+ TRACE_DEFINE_ENUM(SOCK_SEQPACKET);
+ TRACE_DEFINE_ENUM(SOCK_DCCP);
+ TRACE_DEFINE_ENUM(SOCK_PACKET);
+ 
+ #define show_socket_type(type)					\
+ 	__print_symbolic(type,					\
+ 		{ SOCK_STREAM,		"STREAM" },		\
+ 		{ SOCK_DGRAM,		"DGRAM" },		\
+ 		{ SOCK_RAW,		"RAW" },		\
+ 		{ SOCK_RDM,		"RDM" },		\
+ 		{ SOCK_SEQPACKET,	"SEQPACKET" },		\
+ 		{ SOCK_DCCP,		"DCCP" },		\
+ 		{ SOCK_PACKET,		"PACKET" })
+ 
+ /* This list is known to be incomplete, add new enums as needed. */
+ TRACE_DEFINE_ENUM(AF_UNSPEC);
+ TRACE_DEFINE_ENUM(AF_UNIX);
+ TRACE_DEFINE_ENUM(AF_LOCAL);
+ TRACE_DEFINE_ENUM(AF_INET);
+ TRACE_DEFINE_ENUM(AF_INET6);
+ 
+ #define rpc_show_address_family(family)				\
+ 	__print_symbolic(family,				\
+ 		{ AF_UNSPEC,		"AF_UNSPEC" },		\
+ 		{ AF_UNIX,		"AF_UNIX" },		\
+ 		{ AF_LOCAL,		"AF_LOCAL" },		\
+ 		{ AF_INET,		"AF_INET" },		\
+ 		{ AF_INET6,		"AF_INET6" })
+ 
 -DECLARE_EVENT_CLASS(xdr_buf_class,
 +DECLARE_EVENT_CLASS(rpc_xdr_buf_class,
  	TP_PROTO(
 +		const struct rpc_task *task,
  		const struct xdr_buf *xdr
  	),