Hi Eduardo, Today's linux-next merge of the thermal-soc tree got conflicts in: drivers/thermal/thermal_core.c drivers/thermal/thermal_helpers.c drivers/thermal/thermal_sysfs.c between commits from the thermal tree and the same (or similar) patches from the thermal-soc tree. It looks like a the patches have been slightly changed when applied to the thermal tree and then more commist have been applied to the thermal-soc tree, so there are a few conflicts generated. Please fix up these trees. I fixed it up (I used what seemed the appropriate versions - which may or may not be the right ones) and can carry the fixes 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
