linux-next: manual merge of the ftrace tree with the net-next tree

[Stephen Rothwell]

Hi all,

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

  include/trace/events/tcp.h

between commit:

  0f08335ade71 ("trace: tcp: Add tracepoint for tcp_sendmsg_locked()")

from the net-next tree and commit:

  ac01fa73f530 ("tracepoint: Have tracepoints created with DECLARE_TRACE() have _tp suffix")

from the ftrace 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/tcp.h
index 006c2116c8f6,4f9fa1b5b89b..000000000000
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
@@@ -332,31 -259,7 +332,31 @@@ TRACE_EVENT(tcp_retransmit_synack
  		  __entry->saddr_v6, __entry->daddr_v6)
  );
  
 +TRACE_EVENT(tcp_sendmsg_locked,
 +	TP_PROTO(const struct sock *sk, const struct msghdr *msg,
 +		 const struct sk_buff *skb, int size_goal),
 +
 +	TP_ARGS(sk, msg, skb, size_goal),
 +
 +	TP_STRUCT__entry(
 +		__field(const void *, skb_addr)
 +		__field(int, skb_len)
 +		__field(int, msg_left)
 +		__field(int, size_goal)
 +	),
 +
 +	TP_fast_assign(
 +		__entry->skb_addr = skb;
 +		__entry->skb_len = skb ? skb->len : 0;
 +		__entry->msg_left = msg_data_left(msg);
 +		__entry->size_goal = size_goal;
 +	),
 +
 +	TP_printk("skb_addr %p skb_len %d msg_left %d size_goal %d",
 +		  __entry->skb_addr, __entry->skb_len, __entry->msg_left,
 +		  __entry->size_goal));
 +
- DECLARE_TRACE(tcp_cwnd_reduction_tp,
+ DECLARE_TRACE(tcp_cwnd_reduction,
  	TP_PROTO(const struct sock *sk, int newly_acked_sacked,
  		 int newly_lost, int flag),
  	TP_ARGS(sk, newly_acked_sacked, newly_lost, flag)

Attachment: pgpXIrcg8PaM1.pgp
Description: OpenPGP digital signature