* linux-next: manual merge of the input-current tree with Linus' tree
@ 2025-04-28 23:14 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-04-28 23:14 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Kees Cook, Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-28 23:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-28 23:14 linux-next: manual merge of the input-current tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®