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

From: Steven Rostedt <[email-masked]>
Date: Tue, 14 Apr 2015 23:06:29 -0400

On Wed, 15 Apr 2015 11:23:23 +1000
Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> On Mon, 13 Apr 2015 17:52:24 +1000 Stephen Rothwell <[email-masked]> 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 <[email-masked]>
> > Date: Mon, 13 Apr 2015 17:21:30 +1000
> > Subject: [PATCH] iwlwifi: mvm: fix up for tracing split
> > 
> > Signed-off-by: Stephen Rothwell <[email-masked]>

> 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