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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3101 bytes --]

Hi Steven,

Today's linux-next merge of the ftrace tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-devtrace.h between commit 7e1223b50089
("iwlwifi: mvm: new Alive / error table API") from the net-next tree
and commit c5ef935d01a2 ("iwlwifi: Move each system tracepoints to
their own header") from the ftrace tree.

I fixed it up (see patch below, since this code was moved to a new file)
and can carry the fix as necessary (no action is required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 13 Apr 2015 17:21:30 +1000
Subject: [PATCH] iwlwifi: mvm: fix up for tracing split

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
index 6cb66a988271..223b8752f924 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
@@ -116,11 +116,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
 	TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,
 		 u32 data1, u32 data2, u32 line, u32 blink1,
 		 u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
-		 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
+		 u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32 hw_ver,
 		 u32 brd_ver),
 	TP_ARGS(dev, desc, tsf_low, data1, data2, line,
 		blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
-		gp3, ucode_ver, hw_ver, brd_ver),
+		gp3, major, minor, hw_ver, brd_ver),
 	TP_STRUCT__entry(
 		DEV_ENTRY
 		__field(u32, desc)
@@ -136,7 +136,8 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
 		__field(u32, gp1)
 		__field(u32, gp2)
 		__field(u32, gp3)
-		__field(u32, ucode_ver)
+		__field(u32, major)
+		__field(u32, minor)
 		__field(u32, hw_ver)
 		__field(u32, brd_ver)
 	),
@@ -155,21 +156,22 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
 		__entry->gp1 = gp1;
 		__entry->gp2 = gp2;
 		__entry->gp3 = gp3;
-		__entry->ucode_ver = ucode_ver;
+		__entry->major = major;
+		__entry->minor = minor;
 		__entry->hw_ver = hw_ver;
 		__entry->brd_ver = brd_ver;
 	),
 	TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "
 		  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
-		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "
-		  "hw 0x%08X brd 0x%08X",
+		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X "
+		  "minor 0x%08X hw 0x%08X brd 0x%08X",
 		  __get_str(dev), __entry->desc, __entry->tsf_low,
 		  __entry->data1,
 		  __entry->data2, __entry->line, __entry->blink1,
 		  __entry->blink2, __entry->ilink1, __entry->ilink2,
 		  __entry->bcon_time, __entry->gp1, __entry->gp2,
-		  __entry->gp3, __entry->ucode_ver, __entry->hw_ver,
-		  __entry->brd_ver)
+		  __entry->gp3, __entry->major, __entry->minor,
+		  __entry->hw_ver, __entry->brd_ver)
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_event,
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Grumbach, Emmanuel]

> 
> Hi Steven,
> 
> Today's linux-next merge of the ftrace tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-devtrace.h between commit 7e1223b50089
> ("iwlwifi: mvm: new Alive / error table API") from the net-next tree and
> commit c5ef935d01a2 ("iwlwifi: Move each system tracepoints to their own
> header") from the ftrace tree.
> 
> I fixed it up (see patch below, since this code was moved to a new file) and
> can carry the fix as necessary (no action is required).

Yes - So I was discussing that with Steven and you fixed it properly. Thank your for that.

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 13 Apr 2015 17:21:30 +1000
> Subject: [PATCH] iwlwifi: mvm: fix up for tracing split
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> index 6cb66a988271..223b8752f924 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> @@ -116,11 +116,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
>  	TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,
>  		 u32 data1, u32 data2, u32 line, u32 blink1,
>  		 u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
> -		 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
> +		 u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32
> hw_ver,
>  		 u32 brd_ver),
>  	TP_ARGS(dev, desc, tsf_low, data1, data2, line,
>  		blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
> -		gp3, ucode_ver, hw_ver, brd_ver),
> +		gp3, major, minor, hw_ver, brd_ver),
>  	TP_STRUCT__entry(
>  		DEV_ENTRY
>  		__field(u32, desc)
> @@ -136,7 +136,8 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
>  		__field(u32, gp1)
>  		__field(u32, gp2)
>  		__field(u32, gp3)
> -		__field(u32, ucode_ver)
> +		__field(u32, major)
> +		__field(u32, minor)
>  		__field(u32, hw_ver)
>  		__field(u32, brd_ver)
>  	),
> @@ -155,21 +156,22 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
>  		__entry->gp1 = gp1;
>  		__entry->gp2 = gp2;
>  		__entry->gp3 = gp3;
> -		__entry->ucode_ver = ucode_ver;
> +		__entry->major = major;
> +		__entry->minor = minor;
>  		__entry->hw_ver = hw_ver;
>  		__entry->brd_ver = brd_ver;
>  	),
>  	TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "
>  		  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
> -		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X
> "
> -		  "hw 0x%08X brd 0x%08X",
> +		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X
> "
> +		  "minor 0x%08X hw 0x%08X brd 0x%08X",
>  		  __get_str(dev), __entry->desc, __entry->tsf_low,
>  		  __entry->data1,
>  		  __entry->data2, __entry->line, __entry->blink1,
>  		  __entry->blink2, __entry->ilink1, __entry->ilink2,
>  		  __entry->bcon_time, __entry->gp1, __entry->gp2,
> -		  __entry->gp3, __entry->ucode_ver, __entry->hw_ver,
> -		  __entry->brd_ver)
> +		  __entry->gp3, __entry->major, __entry->minor,
> +		  __entry->hw_ver, __entry->brd_ver)
>  );
> 
>  TRACE_EVENT(iwlwifi_dev_ucode_event,
> --
> 2.1.4
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3403 bytes --]

Hi all,

On Mon, 13 Apr 2015 17:52:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-devtrace.h between commit 7e1223b50089
> ("iwlwifi: mvm: new Alive / error table API") from the net-next tree
> and commit c5ef935d01a2 ("iwlwifi: Move each system tracepoints to
> their own header") from the ftrace tree.
> 
> I fixed it up (see patch below, since this code was moved to a new file)
> and can carry the fix as necessary (no action is required).
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 13 Apr 2015 17:21:30 +1000
> Subject: [PATCH] iwlwifi: mvm: fix up for tracing split
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> index 6cb66a988271..223b8752f924 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
> @@ -116,11 +116,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
>  	TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,
>  		 u32 data1, u32 data2, u32 line, u32 blink1,
>  		 u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
> -		 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
> +		 u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32 hw_ver,
>  		 u32 brd_ver),
>  	TP_ARGS(dev, desc, tsf_low, data1, data2, line,
>  		blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
> -		gp3, ucode_ver, hw_ver, brd_ver),
> +		gp3, major, minor, hw_ver, brd_ver),
>  	TP_STRUCT__entry(
>  		DEV_ENTRY
>  		__field(u32, desc)
> @@ -136,7 +136,8 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
>  		__field(u32, gp1)
>  		__field(u32, gp2)
>  		__field(u32, gp3)
> -		__field(u32, ucode_ver)
> +		__field(u32, major)
> +		__field(u32, minor)
>  		__field(u32, hw_ver)
>  		__field(u32, brd_ver)
>  	),
> @@ -155,21 +156,22 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
>  		__entry->gp1 = gp1;
>  		__entry->gp2 = gp2;
>  		__entry->gp3 = gp3;
> -		__entry->ucode_ver = ucode_ver;
> +		__entry->major = major;
> +		__entry->minor = minor;
>  		__entry->hw_ver = hw_ver;
>  		__entry->brd_ver = brd_ver;
>  	),
>  	TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "
>  		  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
> -		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "
> -		  "hw 0x%08X brd 0x%08X",
> +		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X "
> +		  "minor 0x%08X hw 0x%08X brd 0x%08X",
>  		  __get_str(dev), __entry->desc, __entry->tsf_low,
>  		  __entry->data1,
>  		  __entry->data2, __entry->line, __entry->blink1,
>  		  __entry->blink2, __entry->ilink1, __entry->ilink2,
>  		  __entry->bcon_time, __entry->gp1, __entry->gp2,
> -		  __entry->gp3, __entry->ucode_ver, __entry->hw_ver,
> -		  __entry->brd_ver)
> +		  __entry->gp3, __entry->major, __entry->minor,
> +		  __entry->hw_ver, __entry->brd_ver)
>  );
>  
>  TRACE_EVENT(iwlwifi_dev_ucode_event,

This patch is now needed when the net-next tree is merged with Linus'
tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Apr 2015 11:23:23 +1000

> This patch is now needed when the net-next tree is merged with Linus'
> tree ...

Yeah I noticed this while working on test merges into Linus's tree,
thanks.

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

[Steven Rostedt]

On Wed, 15 Apr 2015 11:23:23 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> On Mon, 13 Apr 2015 17:52:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the ftrace tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-devtrace.h between commit 7e1223b50089
> > ("iwlwifi: mvm: new Alive / error table API") from the net-next tree
> > and commit c5ef935d01a2 ("iwlwifi: Move each system tracepoints to
> > their own header") from the ftrace tree.
> > 
> > I fixed it up (see patch below, since this code was moved to a new file)
> > and can carry the fix as necessary (no action is required).
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 13 Apr 2015 17:21:30 +1000
> > Subject: [PATCH] iwlwifi: mvm: fix up for tracing split
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>


> This patch is now needed when the net-next tree is merged with Linus'
> tree ...

I also noted this coming conflict in my pull request. So Linus should
be very well aware of it.

 https://lkml.org/lkml/2015/4/13/652

"Also there's a conflict with commit 7e1223b50089 ("iwlwifi: mvm: new
Alive / error table API") that Stephen found and he resolved it with
cd98c1ef4ec1a4d08e920060b70e47a5a4e69377."

That is, if that commit sha1 still exists.

-- Steve

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

[David Miller]

From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 14 Apr 2015 23:06:29 -0400

> I also noted this coming conflict in my pull request. So Linus should
> be very well aware of it.
> 
>  https://lkml.org/lkml/2015/4/13/652
> 
> "Also there's a conflict with commit 7e1223b50089 ("iwlwifi: mvm: new
> Alive / error table API") that Stephen found and he resolved it with
> cd98c1ef4ec1a4d08e920060b70e47a5a4e69377."
> 
> That is, if that commit sha1 still exists.

I'll be sure to explain this to Linus.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2363 bytes --]

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                    sfr@canb.auug.org.au

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]