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
| ||
|
Date: Mon, 14 Dec 2020 16:33:57 -0500 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> Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree On Tue, 15 Dec 2020 07:37:25 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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. Both updates were done by me, and I assumed that the fix was trivial enough for Linus to figure out. But I'll try to remember to include a note about it before sending to Linus. Cheers, -- Steve
Powered by blists - more mailing lists