* linux-next: manual merge of the hwmon-staging tree with the hwmon-fixes tree
@ 2026-05-08 11:13 Thierry Reding
0 siblings, 0 replies; only message in thread
From: Thierry Reding @ 2026-05-08 11:13 UTC (permalink / raw)
To: Guenter Roeck
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Markus Stockhausen
Hi all,
Today's linux-next merge of the hwmon-staging tree got a conflict in:
drivers/hwmon/lm75.c
between commit:
3607422cdeeb ("hwmon: (lm75) Fix AS6200 and TMP112 setup and alarm handling")
from the hwmon-fixes tree and commit:
4ab59263fd78 ("hwmon: (lm75) Fix AS6200 setup and alarm handling")
from the hwmon-staging tree.
I fixed it up by using the version from hwmon-staging. There's a 50%
chance that I got it right. 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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-05-08 11:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-08 11:13 linux-next: manual merge of the hwmon-staging tree with the hwmon-fixes tree Thierry Reding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox