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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 14 Apr 2015 15:16:24 +1000

Hi Steven,

Today's linux-next merge of the ftrace tree got a conflict in
net/mac80211/trace.h between commit ba8c3d6f16a1 ("mac80211: add an
intermediate software queue implementation") from the net-next tree and
commit 1bc1e4d048d3 ("mac80211: Move message tracepoints to their own
header") from the ftrace tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc net/mac80211/trace.h
index 790bd45081c4,755a5388dbca..000000000000
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@@ -2312,75 -2312,6 +2312,37 @@@ TRACE_EVENT(drv_tdls_recv_channel_switc
  	)
  );
  
 +TRACE_EVENT(drv_wake_tx_queue,
 +	TP_PROTO(struct ieee80211_local *local,
 +		 struct ieee80211_sub_if_data *sdata,
 +		 struct txq_info *txq),
 +
 +	TP_ARGS(local, sdata, txq),
 +
 +	TP_STRUCT__entry(
 +		LOCAL_ENTRY
 +		VIF_ENTRY
 +		STA_ENTRY
 +		__field(u8, ac)
 +		__field(u8, tid)
 +	),
 +
 +	TP_fast_assign(
 +		struct ieee80211_sta *sta = txq->txq.sta;
 +
 +		LOCAL_ASSIGN;
 +		VIF_ASSIGN;
 +		STA_ASSIGN;
 +		__entry->ac = txq->txq.ac;
 +		__entry->tid = txq->txq.tid;
 +	),
 +
 +	TP_printk(
 +		LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " ac:%d tid:%d",
 +		LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ac, __entry->tid
 +	)
 +);
 +
- #ifdef CONFIG_MAC80211_MESSAGE_TRACING
- #undef TRACE_SYSTEM
- #define TRACE_SYSTEM mac80211_msg
- 
- #define MAX_MSG_LEN	100
- 
- DECLARE_EVENT_CLASS(mac80211_msg_event,
- 	TP_PROTO(struct va_format *vaf),
- 
- 	TP_ARGS(vaf),
- 
- 	TP_STRUCT__entry(
- 		__dynamic_array(char, msg, MAX_MSG_LEN)
- 	),
- 
- 	TP_fast_assign(
- 		WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
- 				       MAX_MSG_LEN, vaf->fmt,
- 				       *vaf->va) >= MAX_MSG_LEN);
- 	),
- 
- 	TP_printk("%s", __get_str(msg))
- );
- 
- DEFINE_EVENT(mac80211_msg_event, mac80211_info,
- 	TP_PROTO(struct va_format *vaf),
- 	TP_ARGS(vaf)
- );
- DEFINE_EVENT(mac80211_msg_event, mac80211_dbg,
- 	TP_PROTO(struct va_format *vaf),
- 	TP_ARGS(vaf)
- );
- DEFINE_EVENT(mac80211_msg_event, mac80211_err,
- 	TP_PROTO(struct va_format *vaf),
- 	TP_ARGS(vaf)
- );
- #endif
- 
  #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
  
  #undef TRACE_INCLUDE_PATH