On Thu, 28 Oct 2021 16:31:11 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Today's linux-next merge of the ftrace tree got conflicts in: > > include/linux/trace_recursion.h > kernel/trace/ftrace.c Yeah, this is one of the times I will be sending Linus a link to the merge of his tree in my repo for my pull request. I have this ready. > @@@ -162,12 -192,22 +165,18 @@@ > current->trace_recursion = val; > barrier(); > > + preempt_disable_notrace(); > + The only difference between what I have and yours, is that I nuked the extra space ;-) Thanks, -- Steve > - return bit + 1; > + return bit; > } >
