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

From	Steven Rostedt <rostedt@goodmis.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the ftrace tree with Linus' tree
Date	2015-11-05 04:30 +0100
Message-ID	<qrjpn-1a1-1@gated-at.bofh.it> (permalink)
References	<qriWl-BZ-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Thu, 5 Nov 2015 13:51:40 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Steven,
> 
> Today's linux-next merge of the ftrace tree got a conflict in:
> 
>   kernel/trace/trace_stack.c
> 
> between commit:
> 
>   a2d762904832 ("tracing: Have stack tracer force RCU to be watching")
> 
> from Linus' tree and commit:
> 
>   d332736df0c2 ("tracing: Rename max_stack_lock to stack_trace_max_lock")
> 
> from the ftrace tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Thanks, the fix looks good.

-- Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the ftrace tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-05 04:00 +0100
  Re: linux-next: manual merge of the ftrace tree with Linus' tree Steven Rostedt <rostedt@goodmis.org> - 2015-11-05 04:30 +0100

csiph-web