# git rev-parse -q --verify a5088ee7251e5106a4efa9588a73866eb4b4154e^{commit} a5088ee7251e5106a4efa9588a73866eb4b4154e already have revision, skipping fetch # git checkout -q -f -B kisskb a5088ee7251e5106a4efa9588a73866eb4b4154e # git clean -qxdf # < git log -1 # commit a5088ee7251e5106a4efa9588a73866eb4b4154e # Merge: c79e6fa98ca8 2e70ea7fb987 # Author: Linus Torvalds # Date: Mon Oct 3 15:33:38 2022 -0700 # # Merge tag 'thermal-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm # # Pull thermal control updates from Rafael Wysocki: # "The most significant part of this update is the thermal control DT # initialization rework from Daniel Lezcano and the following conversion # of drivers to use the new API introduced by it # # Apart from that, the maximum number of trip points in a thermal zone # is increased and there are some fixes and code cleanups # # Specifics: # # - Rework the device tree initialization, convert the drivers to the # new API and remove the old OF code (Daniel Lezcano) # # - Fix return value to -ENODEV when searching for a specific thermal # zone which does not exist (Daniel Lezcano) # # - Fix the return value inspection in of_thermal_zone_find() (Dan # Carpenter) # # - Fix kernel panic when KASAN is enabled as it detects use after free # when unregistering a thermal zone (Daniel Lezcano) # # - Move the set_trip ops inside the therma sysfs code (Daniel Lezcano) # # - Remove unnecessary error message as it is already shown in the # underlying function (Jiapeng Chong) # # - Rework the monitoring path and move the locks upper in the call # stack to fix some potentials race windows (Daniel Lezcano) # # - Fix lockdep_assert() warning introduced by the lock rework (Daniel # Lezcano) # # - Do not lock thermal zone mutex in the user space governor (Rafael # Wysocki) # # - Revert the Mellanox 'hotter thermal zone' feature because it is # already handled in the thermal framework core code (Daniel Lezcano) # # - Increase maximum number of trip points in the thermal core (Sumeet # Pawnikar) # # - Replace strlcpy() with unused retval with strscpy() in the core # thermal control code (Wolfram Sang) # # - Use module_pci_driver() macro in the int340x processor_thermal # driver (Shang XiaoJing) # # - Use get_cpu() instead of smp_processor_id() in the intel_powerclamp # thermal driver to prevent it from crashing and remove unused # accounting for IRQ wakes from it (Srinivas Pandruvada) # # - Consolidate priv->data_vault checks in int340x_thermal (Rafael # Wysocki) # # - Check the policy first in cpufreq_cooling_register() (Xuewen Yan) # # - Drop redundant error message from da9062-thermal (zhaoxiao) # # - Drop of_match_ptr() from thermal_mmio (Jean Delvare)" # # * tag 'thermal-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (55 commits) # thermal: core: Increase maximum number of trip points # thermal: int340x: processor_thermal: Use module_pci_driver() macro # thermal: intel_powerclamp: Remove accounting for IRQ wakes # thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash # thermal: int340x_thermal: Consolidate priv->data_vault checks # thermal: cpufreq_cooling: Check the policy first in cpufreq_cooling_register() # thermal: Drop duplicate words from comments # thermal: move from strlcpy() with unused retval to strscpy() # thermal: da9062-thermal: Drop redundant error message # thermal/drivers/thermal_mmio: Drop of_match_ptr() # thermal: gov_user_space: Do not lock thermal zone mutex # Revert "mlxsw: core: Add the hottest thermal zone detection" # thermal/core: Fix lockdep_assert() warning # thermal/core: Move the mutex inside the thermal_zone_device_update() function # thermal/core: Move the thermal zone lock out of the governors # thermal/governors: Group the thermal zone lock inside the throttle function # thermal/core: Rework the monitoring a bit # thermal/core: Rearm the monitoring only one time # thermal/drivers/qcom/spmi-adc-tm5: Remove unnecessary print function dev_err() # thermal/of: Remove old OF code # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 a5088ee7251e5106a4efa9588a73866eb4b4154e # < make -s -j 8 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 8 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 8 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 8 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:545, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:464:26: note: in expansion of macro 'printk_index_wrap' 464 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:04:38.987849