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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the nfsd tree got a conflict in:

  include/trace/events/sunrpc.h

between commit:

  b4776a341ec0 ("SUNRPC: Tracepoints should display tk_pid and cl_clid as a fixed-size field")

from the nfs tree and commit:

  35940a58f9f1 ("SUNRPC: Capture value of xdr_buf::page_base")

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 dc922e664820,9ea59959a2fe..000000000000
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -80,11 -80,12 +82,14 @@@ DECLARE_EVENT_CLASS(rpc_xdr_buf_class
  		__entry->msg_len = xdr->len;
  	),
  
 -	TP_printk("task:%u@%u head=[%p,%zu] page=%u(%u) tail=[%p,%zu] len=%u",
 +	TP_printk(SUNRPC_TRACE_TASK_SPECIFIER
 +		  " head=[%p,%zu] page=%u tail=[%p,%zu] len=%u",
++		  " head=[%p,%zu] page=%u(%u) tail=[%p,%zu] len=%u",
  		__entry->task_id, __entry->client_id,
- 		__entry->head_base, __entry->head_len, __entry->page_len,
- 		__entry->tail_base, __entry->tail_len, __entry->msg_len
+ 		__entry->head_base, __entry->head_len,
+ 		__entry->page_len, __entry->page_base,
+ 		__entry->tail_base, __entry->tail_len,
+ 		__entry->msg_len
  	)
  );

Attachment: pgp3B5G9F6mUR.pgp
Description: OpenPGP digital signature