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

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

Message-ID: <20250429091432.4d8181a9@canb.auug.org.au>
Date: Tue, 29 Apr 2025 09:14:32 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Kees Cook <kees@...nel.org>, Linus Torvalds
 <torvalds@...ux-foundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the input-current tree with Linus' tree

Hi all,

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

  drivers/input/joystick/magellan.c

between commit:

  05e8d261a34e ("gcc-15: add '__nonstring' markers to byte arrays")

from Linus' tree and commit:

  936a25ef11f5 ("input/joystick: magellan: Mark __nonstring look-up table")

from the input-current tree.

I fixed it up (I just osed the latter - as it also marked the look-up
table as const) 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