Merge tag 'v4.1.38' into 4.1-2.0.x-imx

Linux 4.1.38

* tag 'v4.1.38': (109 commits)
  Linux 4.1.38
  gro: Allow tunnel stacking in the case of FOU/GUE
  tunnels: Don't apply GRO to multiple layers of encapsulation.
  net: ipv4: Convert IP network timestamps to be y2038 safe
  ipip: Properly mark ipip GRO packets as encapsulated.
  sg_write()/bsg_write() is not fit to be called under KERNEL_DS
  fs: exec: apply CLOEXEC before changing dumpable task flags
  IB/cma: Fix a race condition in iboe_addr_get_sgid()
  Revert "ALSA: usb-audio: Fix race at stopping the stream"
  kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)
  drivers/gpu/drm/ast: Fix infinite loop if read fails
  target/user: Fix use-after-free of tcmu_cmds if they are expired
  kernel/debug/debug_core.c: more properly delay for secondary CPUs
  scsi: avoid a permanent stop of the scsi device's request queue
  IB/multicast: Check ib_find_pkey() return value
  IPoIB: Avoid reading an uninitialized member variable
  block_dev: don't test bdev->bd_contains when it is not stable
  btrfs: limit async_work allocation and worker func duration
  mm/vmscan.c: set correct defer count for shrinker
  Input: drv260x - fix input device's parent assignment
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index 1967bee4f076..9035fbc5e98d 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -98,7 +98,7 @@ temp_crit_show(struct device *dev, struct device_attribute *attr, char *buf)
 	long temperature;
 	int ret;
 
-	ret = tz->ops->get_trip_temp(tz, 0, &temperature);
+	ret = tz->ops->get_crit_temp(tz, &temperature);
 	if (ret)
 		return ret;