Merge branch 'thermal-intel'

Merge an x86_pkg_temp_thermal Intel thermal driver fix (Zhang Rui).

* thermal-intel:
  thermal: intel: x86_pkg_temp_thermal: Add lower bound check for sysfs input

diff --cc drivers/thermal/intel/x86_pkg_temp_thermal.c
index c4ec314441be5299c12b51956a24ee32fff57937,128ee02596edf14dfb89b10db80445f7a16971ca..11a7f8108bbbfeb5a92e054f203b242c340ebaf4
--- 1/drivers/thermal/intel/x86_pkg_temp_thermal.c
--- 2/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@@ -122,9 -122,9 +122,9 @@@ static int sys_get_curr_temp(struct the
  static int
  sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp)
  {
 -      struct zone_device *zonedev = tzd->devdata;
 +      struct zone_device *zonedev = thermal_zone_device_priv(tzd);
        u32 l, h, mask, shift, intr;
-       int tj_max, ret;
+       int tj_max, val, ret;
  
        tj_max = intel_tcc_get_tjmax(zonedev->cpu);
        if (tj_max < 0)