Hi all,

Today's linux-next merge of the thermal tree got a conflict in:

  drivers/thermal/thermal_acpi.c

between commit:

  7a0e39748861 ("thermal: ACPI: Add ACPI trip point routines")

from the pm tree and commit:

  4bb6439371e9 ("thermal/acpi: Add ACPI trip point routines")

from the thermal tree.

These commits are very similar, and I just used the former (as it
is newer).

I fixed it up (see above) 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