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

2015-04-14 Thread David Miller
From: Steven Rostedt 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

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

2015-04-14 Thread Steven Rostedt
On Wed, 15 Apr 2015 11:23:23 +1000 Stephen Rothwell wrote: > Hi all, > > On Mon, 13 Apr 2015 17:52:24 +1000 Stephen Rothwell > 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:

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

2015-04-14 Thread David Miller
From: Stephen Rothwell 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" i

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

2015-04-14 Thread Stephen Rothwell
Hi all, On Mon, 13 Apr 2015 17:52:24 +1000 Stephen Rothwell 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 c5ef9

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

2015-04-13 Thread Stephen Rothwell
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 t

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

2015-04-13 Thread 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 th

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

2015-04-13 Thread Stephen Rothwell
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"