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

Hi all, Today's linux-next merge of the ftrace tree got a conflict in: kernel/trace/trace.c between commit: b220c049d519 ("tracing: Check length before giving out the filter buffer") from Linus' tree and commit: 36590c50b2d0 ("tracing: Merge irqflags + preempt counter.") from the ftrac

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

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

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

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

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

Hi all, 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 Linus' tree and commit: 5b7be9c709e1 ("ring-buffer: Add test to validate the ti

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

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

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

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: > >

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

Hi all, Today's linux-next merge of the ftrace tree got a conflict in: arch/x86/entry/entry_64.S between commits: 8f34c5b5afce ("x86/exceptions: Make IST index zero based") 3207426925d2 ("x86/exceptions: Disconnect IST index and stack order") 2a594d4ccf3f ("x86/exceptions: Split debug I

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

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: a15fd609ad53 ("tracing: Simplify "if" macro code") from the ftrace tree. I fixed it

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

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in: kernel/events/uprobes.c between commit: 788faab70d5a ("perf, tools: Use correct articles in comments") from Linus' tree and commit: 38e967ae1e60 ("Uprobes: Simplify uprobe_register() body") from the ftrace tree.

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

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

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

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")

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

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in kernel/panic.c between commit dcb6b45254e2 ("panic: add cpu/pid to warn_slowpath_common in WARNING printk()s") from the tree and commit de7edd31457b ("tracing: Disable tracing on warning") from the ftrace tree. I fixed it u

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

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 f1943977e664 ("tracing: Get rid of unneeded key calculation in ftrace_hash_move()") and e1df4cb68

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

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in kernel/trace/trace.c between commit 2930e04d00e1 ("tracing: Fix race with update_max_tr_single and changing tracers") from Linus' tree and commits 2b6080f28c7c ("tracing: Encapsulate global_trace and remove dependencies on gl

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

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

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

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 function probe to only enable needed functions") from the ftrace tree.