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

From: David Miller
Date: Tue Apr 14 2015 - 23:24:55 EST

From: Steven Rostedt <rostedt@xxxxxxxxxxx>
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.
> "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.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at