Linus Torvalds dfb22fc5c0 thermal: fix intel PCH thermal driver mismerge ... I didn't notice this when merging the thermal code from Zhang, but his merge (commit 5a924a07f8: "Merge branches 'thermal-core' and 'thermal-intel' of .git into next") of the thermal-core and thermal-intel branches was wrong. In thermal-core, commit 17e8351a77 ("thermal: consistently use int for temperatures") converted the thermal layer to use "int" for temperatures. But in parallel, in the thermal-intel branch commit d0a12625d2 ("thermal: Add Intel PCH thermal driver") added support for the intel PCH thermal sensor using the old interfaces that used "unsigned long" pointers. This resulted in warnings like this: drivers/thermal/intel_pch_thermal.c:184:14: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .get_temp = pch_thermal_get_temp, ^ drivers/thermal/intel_pch_thermal.c:184:14: note: (near initialization for ‘tzd_ops.get_temp’) drivers/thermal/intel_pch_thermal.c:186:19: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .get_trip_temp = pch_get_trip_temp, ^ drivers/thermal/intel_pch_thermal.c:186:19: note: (near initialization for ‘tzd_ops.get_trip_temp’) This fixes it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2015-09-11 20:06:59 -07:00
..
accessibility
acpi
amba
android
ata
atm
auxdisplay
base	Additional power management and ACPI material for v4.3-rc1	2015-09-11 19:11:06 -07:00
bcma
block
bluetooth
bus
cdrom
char
clk
clocksource
connector
cpufreq	Additional power management and ACPI material for v4.3-rc1	2015-09-11 19:11:06 -07:00
cpuidle	Additional power management and ACPI material for v4.3-rc1	2015-09-11 19:11:06 -07:00
crypto
dca
devfreq
dio
dma
dma-buf
edac
eisa
extcon
firewire
firmware
fmc
gpio
gpu	media updates for v4.3-rc1	2015-09-11 16:42:39 -07:00
hid
hsi
hv
hwmon
hwspinlock
hwtracing/coresight
i2c
ide
idle
iio
infiniband	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-09-11 19:00:42 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-09-11 19:17:28 -07:00
iommu
ipack
irqchip
isdn
leds
lguest
macintosh
mailbox
mcb
md	SCSI misc on 20150911	2015-09-11 18:15:18 -07:00
media	media updates for v4.3-rc1	2015-09-11 16:42:39 -07:00
memory
memstick
message
mfd
misc
mmc
mtd
net	NTB bug and documentation fixes, new device IDs, performance	2015-09-11 19:29:00 -07:00
nfc
ntb
nubus
nvdimm
nvmem
of
oprofile
parisc
parport
pci
pcmcia
perf
phy
pinctrl
platform
pnp
power
powercap
pps
ps3
ptp
pwm
rapidio
ras
regulator
remoteproc
reset
rpmsg
rtc
s390
sbus
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-09-11 19:00:42 -07:00
sfi
sh
sn
soc
spi
spmi
ssb
staging	Additional power management and ACPI material for v4.3-rc1	2015-09-11 19:11:06 -07:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-09-11 19:00:42 -07:00
tc
thermal	thermal: fix intel PCH thermal driver mismerge	2015-09-11 20:06:59 -07:00
thunderbolt
tty
uio
usb
uwb
vfio
vhost
video
virt
virtio
vlynq
vme
w1
watchdog
xen
zorro
Kconfig
Makefile