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	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
amba
android	mm: mark most vm_operations_struct const	2015-09-10 13:29:01 -07:00
ata	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2015-09-03 16:55:55 -07:00
atm
auxdisplay
base	Additional power management and ACPI material for v4.3-rc1	2015-09-11 19:11:06 -07:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2015-09-11 12:33:03 -07:00
bluetooth	Bluetooth: hci_bcm: Fix crash on suspend	2015-08-28 21:09:14 +02:00
bus	regmap: Changes for v4.3	2015-09-08 16:48:55 -07:00
cdrom
char	IPMI updates for 4.3	2015-09-08 18:19:17 -07:00
clk	ARM: SoC: late fixes and dependencies	2015-09-10 17:59:04 -07:00
clocksource	- New Device Support	2015-09-04 11:35:03 -07:00
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	drivers/crypto/qat: use seq_hex_dump() to dump buffers	2015-09-10 13:29:01 -07:00
dca
devfreq
dio
dma	dmaengine updates for 4.3-rc1	2015-09-04 11:10:18 -07:00
dma-buf
edac	edac updates for v4.3-rc1	2015-09-11 16:21:12 -07:00
eisa
extcon	regulator: Updates for v4.3	2015-08-31 15:49:19 -07:00
firewire
firmware	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00
fmc
gpio	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-09-04 15:49:32 -07:00
gpu	media updates for v4.3-rc1	2015-09-11 16:42:39 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-09-04 12:02:11 -07:00
hsi	mm: mark most vm_operations_struct const	2015-09-10 13:29:01 -07:00
hv
hwmon	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
hwspinlock
hwtracing/coresight
i2c	Merge branch 'i2c/for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2015-09-08 16:16:26 -07:00
ide
idle
iio	This is the bulk of GPIO changes for the v4.3 kernel cycle:	2015-09-04 10:07:45 -07:00
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	fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void	2015-09-11 15:21:34 -07:00
ipack
irqchip	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-09-08 11:36:56 -07:00
isdn	libnvdimm for 4.3:	2015-09-08 14:35:59 -07:00
leds	- Stop using LP855X Platform Data to control regulators	2015-09-04 11:40:40 -07:00
lguest
macintosh	powerpc updates for 4.3	2015-09-03 16:41:38 -07:00
mailbox	Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration	2015-09-05 18:11:04 -07:00
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	IOMMU Updates for Linux v4.3	2015-09-08 17:22:35 -07:00
memstick
message
mfd	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-09-04 15:49:32 -07:00
misc	Merge git://www.linux-watchdog.org/linux-watchdog	2015-09-11 15:12:59 -07:00
mmc	MMC core:	2015-09-08 16:33:16 -07:00
mtd	MTD updates #2 for 4.3-rc1:	2015-09-09 11:17:33 -07:00
net	NTB bug and documentation fixes, new device IDs, performance	2015-09-11 19:29:00 -07:00
nfc	This is the bulk of GPIO changes for the v4.3 kernel cycle:	2015-09-04 10:07:45 -07:00
ntb	NTB: Fix range check on memory window index	2015-09-07 15:27:12 -04:00
nubus
nvdimm	libnvdimm for 4.3:	2015-09-08 14:35:59 -07:00
nvmem
of	Merge branch 'i2c/for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2015-09-08 16:16:26 -07:00
oprofile
parisc	parisc: use seq_hex_dump() to dump buffers	2015-09-10 13:29:01 -07:00
parport
pci	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00
pcmcia	pcmcia: soc_common: remove skt_dev_info's clk pointer	2015-09-03 16:01:03 +01:00
perf
phy	This is the bulk of GPIO changes for the v4.3 kernel cycle:	2015-09-04 10:07:45 -07:00
pinctrl	This is the bulk of pin control changes for the v4.3 development	2015-09-04 10:22:09 -07:00
platform	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
pnp
power	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
powercap	powercap / RAPL: disable the 2nd power limit properly	2015-08-29 01:46:40 +02:00
pps
ps3
ptp
pwm	pwm: Changes for v4.3-rc1	2015-09-09 10:55:32 -07:00
rapidio
ras
regulator	regmap: Changes for v4.3	2015-09-08 16:48:55 -07:00
remoteproc
reset	reset: ath79: Fix missing spin_lock_init	2015-09-01 14:48:40 +02:00
rpmsg
rtc	rtc: abx80x: fix RTC write bit	2015-09-05 19:37:31 +02:00
s390	drivers/s390/crypto/zcrypt_api.c: use seq_hex_dump() to dump buffers	2015-09-10 13:29:01 -07:00
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	ARM: SoC: late fixes and dependencies	2015-09-10 17:59:04 -07:00
spi	Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/xcomm' and 'spi/topic/xlp' into spi-next	2015-08-31 14:45:45 +01:00
spmi	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-09-01 14:33:35 -07:00
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	xen: MFN/GFN/BFN terminology changes for 4.3-rc0	2015-09-10 16:21:11 -07:00
uio
usb	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-09-01 18:46:42 -07:00
uwb
vfio
vhost
video	Merge branch 'akpm' (patches from Andrew)	2015-09-10 18:19:42 -07:00
virt
virtio	virtio_balloon: do not change memory amount visible via /proc/meminfo	2015-09-08 13:32:11 +03:00
vlynq
vme
w1	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-09-01 18:46:42 -07:00
watchdog	Merge git://www.linux-watchdog.org/linux-watchdog	2015-09-11 15:12:59 -07:00
xen	Merge branch 'akpm' (patches from Andrew)	2015-09-10 18:19:42 -07:00
zorro
Kconfig	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-09-03 16:27:01 -07:00
Makefile	This is the bulk of pin control changes for the v4.3 development	2015-09-04 10:22:09 -07:00