Hi all,
Today's linux-next merge of the hwmon-staging tree got a conflict in:
drivers/hwmon/iio_hwmon.c
between commit:
d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500")
from Linus' tree and commit:
2119f92b6b66 ("hwmon: Convert remaining drivers to use SPDX identifier")
from the hwmon-staging tree.
I fixed it up (Ijust used the version from Linus' tree - GPL-2.0-only
v. GPL-2.0) 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:
pgplSGAmzROh2.pgp
Description: OpenPGP digital signature
