* linux-next: manual merge of the watchdog tree with the origin tree
@ 2024-12-03 22:15 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2024-12-03 22:15 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: Guenter Roeck, Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List, Uwe Kleine-König, Wim Van Sebroeck
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
Hi all,
Today's linux-next merge of the watchdog tree got a conflict in:
drivers/watchdog/sa1100_wdt.c
between commit:
e70140ba0d2b1 ("Get rid of 'remove_new' relic from platform driver struct")
from the origin tree and commit:
562b0b03193b5 ("watchdog: Switch back to struct platform_driver::remove()")
from the watchdog tree.
I fixed it up (see below) 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.
(no diff, used Linus' version)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-12-03 22:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-03 22:15 linux-next: manual merge of the watchdog tree with the origin tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox