linux-kernel - linux-next: manual merge of the ftrace tree with the tip 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20211007123924.748d2dda@canb.auug.org.au>
Date:   Thu, 7 Oct 2021 12:39:24 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steven Rostedt <rostedt@...dmis.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Masami Hiramatsu <mhiramat@...nel.org>
Subject: linux-next: manual merge of the ftrace tree with the tip tree

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  kernel/kprobes.c

between commit:

  670721c7bd2a ("sched: Move kprobes cleanup out of finish_task_switch()")

from the tip tree and commit:

  223a76b268c9 ("kprobes: Fix coding style issues")

from the ftrace tree.

I fixed it up (I just used the former version of the changed comment) 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

Content of type "application/pgp-signature" skipped