# 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/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 a5088ee7251e5106a4efa9588a73866eb4b4154e # < make -s -j 40 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 40 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 40 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 40 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/machvec.c: In function 'sh_mv_setup': /kisskb/src/arch/sh/kernel/machvec.c:105:33: warning: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Warray-bounds] 105 | sh_mv = *(struct sh_machine_vector *)&__machvec_start; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/kernel/machvec.c:13: /kisskb/src/arch/sh/include/asm/sections.h:7:13: note: while referencing '__machvec_start' 7 | extern long __machvec_start, __machvec_end; | ^~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:596, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc11 # Build took: 0:00:19.888768