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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 28 Oct 2021 09:14:37 -0400
From:   Steven Rostedt <rostedt@...dmis.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Wang <yun.wang@...ux.alibaba.com>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree


On Thu, 28 Oct 2021 16:31:11 +1100
Stephen Rothwell <sfr@...b.auug.org.au> 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;
>   }
>