linux-kernel - linux-next: manual merge of the ftrace tree with the mm-nonmm-stable 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: <20240515123758.30904383@canb.auug.org.au>
Date: Wed, 15 May 2024 12:37:58 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Steven Rostedt <rostedt@...dmis.org>, Masami Hiramatsu
 <mhiramat@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Rasmus Villemoes
 <linux@...musvillemoes.dk>
Subject: linux-next: manual merge of the ftrace tree with the
 mm-nonmm-stable tree

Hi all,

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

  init/main.c

between commit:

  212f863fa881 ("bootconfig: do not put quotes on cmdline items unless necessary")

from the mm-nonmm-stable tree and commit:

  efee03a50c28 ("bootconfig: do not put quotes on cmdline items unless necessary")

from the ftrace tree.

I fixed it up (I just used the former - since it has an extra 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