Messages in this thread | | | Date | Mon, 15 Feb 2021 15:03:08 +1100 | From | Stephen Rothwell <> | Subject | 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 ftrace tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc kernel/trace/trace.c index b5815a022ecc,b79bcacdd6f9..000000000000 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@@ -2745,8 -2739,8 +2739,8 @@@ trace_event_buffer_lock_reserve(struct (entry = this_cpu_read(trace_buffered_event))) { /* Try to use the per cpu buffer first */ val = this_cpu_inc_return(trace_buffered_event_cnt); - if (val == 1) { + if ((len < (PAGE_SIZE - sizeof(*entry))) && val == 1) { - trace_event_setup(entry, type, flags, pc); + trace_event_setup(entry, type, trace_ctx); entry->array[0] = len; return entry; } [unhandled content-type:application/pgp-signature] | |