On Tue, 15 Dec 2020 07:37:25 +1100
Stephen Rothwell wrote:
> > + check_buffer(cpu_buffer, info, CHECK_FULL_PAGE);
> > return rb_move_tail(cpu_buffer, tail, info);
> > }
> >
>
> Just a reminder that this conflict still exists.
>
Thanks for the reminder. B
Hi all,
On Tue, 8 Dec 2020 16:02:22 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> kernel/trace/ring_buffer.c
>
> between commit:
>
> 68e10d5ff512 ("ring-buffer: Always check to put back before stamp when
> crossing pages")
>
> from
Hi Steve,
On Wed, 15 May 2019 21:53:05 -0400 Steven Rostedt wrote:
>
> I mentioned this conflict and the entry_64.S one to Linus when
> submitting my pull request. I fixed it up too in my ftrace/conflicts
> branch.
And he has merged your branch now, so all good.
--
Cheers,
Stephen Rothwell
p
On Thu, 16 May 2019 11:05:48 +1000
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> include/linux/compiler.h
>
> between commit:
>
> 37686b1353cf ("tracing: Improve "if" macro code generation")
>
> from Linus' tree and commit:
>
>
On Thu, 5 Nov 2015 13:51:40 +1100
Stephen Rothwell 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 c
On Mon, 2013-03-18 at 13:00 +1100, Stephen Rothwell wrote:
> Hi Steven,
>
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/trace/ftrace.c between commit b67bfe0d42ca ("hlist: drop the node
> parameter from iterators") from Linus' tree and commit e1df4cb682ab
> ("ftrace: Fix
6 matches
Mail list logo
