Changes in Makefile

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/thermal/testing/Makefile

25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 - Merge branch 'next' into for-linus

Tue, 21 Jan 2025 06:37:39 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.14 merge window. List of files: /linux/drivers/thermal/testing/Makefile

6d4a0f4ea72319c9a37c1a7191695467006dd272 - Merge tag 'v6.13-rc3' into next

Tue, 17 Dec 2024 18:40:45 +0100

Merge tag 'v6.13-rc3' into nextSync up with the mainline. List of files: /linux/drivers/thermal/testing/Makefile

77b679453d3364688ff3e5153c0be5b2b52672b7 - Merge tag 'v6.12-rc3' into perf-tools-next

Mon, 14 Oct 2024 19:45:28 +0200

Merge tag 'v6.12-rc3' into perf-tools-nextTo get the fixes in the current perf-tools tree.Signed-off-by: Namhyung Kim List of files: /linux/drivers/thermal/testing/Makefile

3fd6c59042dbba50391e30862beac979491145fe - Merge tag 'v6.12-rc1' into clk-meson-next

Mon, 30 Sep 2024 11:28:07 +0200

Merge tag 'v6.12-rc1' into clk-meson-nextLinux 6.12-rc1 List of files: /linux/drivers/thermal/testing/Makefile

a0efa2f362a69e47b9d8b48f770ef3a0249a7911 - Merge net-next/main to resolve conflicts

Wed, 09 Oct 2024 08:59:14 +0200

Merge net-next/main to resolve conflictsThe wireless-next tree was based on something older, and thereare now conflicts between -rc2 and work here. Merge net-next,which has enough of -rc2 for the conflicts to happen, resolvingthem in the process.Signed-off-by: Johannes Berg List of files: /linux/drivers/thermal/testing/Makefile

b88132ceb3faccdd785809df75f9d490ebaab459 - Merge drm/drm-next into drm-xe-next

Fri, 04 Oct 2024 11:29:21 +0200

Merge drm/drm-next into drm-xe-nextBackmerging to resolve a conflict with core locally.Signed-off-by: Thomas Hellström List of files: /linux/drivers/thermal/testing/Makefile

2dd0ef5d951e9b565ddb324fe26c531b6a40bf82 - Merge drm/drm-next into drm-misc-next

Mon, 30 Sep 2024 10:50:54 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to up v6.12-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/thermal/testing/Makefile

e0568571258d096f0277c74185bcbfc9cf21bccb - Merge drm/drm-next into drm-intel-next

Mon, 30 Sep 2024 10:49:10 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.12-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/thermal/testing/Makefile

c8d430db8eec7d4fd13a6bea27b7086a54eda6da - Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sun, 06 Oct 2024 09:59:22 +0200

Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 6.12, take #1- Fix pKVM error path on init, making sure we do not change critical system registers as we're about to fail- Make sure that the host's vector length is at capped by a value common to all CPUs- Fix kvm_has_feat*() handling of "negative" features, as the current code is pretty broken- Promote Joey to the status of official reviewer, while James steps down -- hopefully only temporarly List of files: /linux/drivers/thermal/testing/Makefile

0c436dfe5c25d0931b164b944165259f95e5281f - Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Wed, 02 Oct 2024 21:29:16 +0200

Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.12A bunch of fixes here that came in during the merge window and the firstweek of release, plus some new quirks and device IDs. There's nothingmajor here, it's a bit bigger than it might've been due to there beingno fixes sent during the merge window due to your vacation. List of files: /linux/drivers/thermal/testing/Makefile

2cd86f02c017bf9733e5cd891381b7d40f6f37ad - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Tue, 01 Oct 2024 18:09:41 +0200

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesRequired for a panthor fix that broke whenFOP_UNSIGNED_OFFSET was added in place of FMODE_UNSIGNED_OFFSET.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/thermal/testing/Makefile

3a39d672e7f48b8d6b91a09afa4b55352773b4b5 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 27 Sep 2024 08:13:52 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.No conflicts and no adjacent changes.Signed-off-by: Paolo Abeni List of files: /linux/drivers/thermal/testing/Makefile

d22300518d875f78203e9afacb5aa0b0316da523 - Merge tag 'thermal-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Mon, 16 Sep 2024 08:05:54 +0200

Merge tag 'thermal-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pmPull thermal control updates from Rafael Wysocki: "These mostly continue to rework the thermal core and the thermal zone driver interface to make the code more straightforward and reduce bloat The most significant piece of this work is a change of the code related to binding cooling devices to thermal zones which, among other things, replaces two previously existing thermal zone operations with one allowing driver implementations to be much simpler There is also a new thermal core testing module allowing mock thermal zones to be created and controlled via debugfs in order to exercise the thermal core functionality. It is expected to be used for implementing thermal core self tests in the future Apart from the above, there are assorted thermal driver updates Specifics: - Update some thermal drivers to eliminate thermal_zone_get_trip() calls from them and get rid of that function (Rafael Wysocki) - Update the thermal sysfs code to store trip point attributes in trip descriptors and get to trip points via attribute pointers (Rafael Wysocki) - Move the computation of the low and high boundaries for thermal_zone_set_trips() to __thermal_zone_device_update() (Daniel Lezcano) - Introduce a debugfs-based facility for thermal core testing (Rafael Wysocki) - Replace the thermal zone .bind() and .unbind() callbacks for binding cooling devices to thermal zones with one .should_bind() callback used for deciding whether or not a given cooling devices should be bound to a given trip point in a given thermal zone (Rafael Wysocki) - Eliminate code that has no more users after the other changes, drop some redundant checks from the thermal core and clean it up (Rafael Wysocki) - Fix rounding of delay jiffies in the thermal core (Rafael Wysocki) - Refuse to accept trip point temperature or hysteresis that would lead to an invalid threshold value when setting them via sysfs (Rafael Wysocki) - Adjust states of all uninitialized instances in the .manage() callback of the Bang-bang thermal governor (Rafael Wysocki) - Drop a couple of redundant checks along with the code depending on them from the thermal core (Rafael Wysocki) - Rearrange the thermal core to avoid redundant checks and simplify control flow in a couple of code paths (Rafael Wysocki) - Add power domain DT bindings for new Amlogic SoCs (Georges Stark) - Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() in the ST driver and add a Kconfig dependency on THERMAL_OF subsystem for the STi driver (Raphael Gallais-Pou) - Simplify the error code path in the probe functions in the brcmstb driver with the helo of dev_err_probe() (Yan Zhen) - Make imx_sc_thermal use dev_err_probe() (Alexander Stein) - Remove trailing space after \n newline in the Renesas driver (Colin Ian King) - Add DT binding compatible string for the SA8255p to the tsens thermal driver (Nikunj Kela) - Use the devm_clk_get_enabled() helpers to simplify the init routine in the sprd thermal driver (Huan Yang) - Remove __maybe_unused notations for the functions by using the new RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() macros on the IMx and Qoriq drivers (Fabio Estevam) - Remove unused declarations from the ti-soc-thermal driver's header file as the functions in question were removed previously (Zhang Zekun)"* tag 'thermal-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (48 commits) thermal: core: Drop thermal_zone_device_is_enabled() thermal: core: Check passive delay in monitor_thermal_zone() thermal: core: Drop dead code from monitor_thermal_zone() thermal: core: Drop redundant lockdep_assert_held() thermal: gov_bang_bang: Adjust states of all uninitialized instances thermal: sysfs: Add sanity checks for trip temperature and hysteresis thermal/drivers/imx_sc_thermal: Use dev_err_probe thermal/drivers/ti-soc-thermal: Remove unused declarations thermal/drivers/imx: Remove __maybe_unused notations thermal/drivers/qoriq: Remove __maybe_unused notations thermal/drivers/sprd: Use devm_clk_get_enabled() helpers dt-bindings: thermal: tsens: document support on SA8255p thermal/drivers/renesas: Remove trailing space after \n newline thermal/drivers/brcmstb_thermal: Simplify with dev_err_probe() thermal/drivers/sti: Depend on THERMAL_OF subsystem thermal/drivers/st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() dt-bindings: thermal: amlogic,thermal: add optional power-domains thermal: core: Drop tz field from struct thermal_instance thermal: core: Drop redundant checks from thermal_bind_cdev_to_trip() thermal: core: Rename cdev-to-thermal-zone bind/unbind functions ... List of files: /linux/drivers/thermal/testing/Makefile

f5c05974349c8e3d80e125b71bd80695807d8528 - Merge branch 'thermal-core'

Thu, 29 Aug 2024 11:45:08 +0200

Merge branch 'thermal-core'Merge thermal core updates for 6.12 which, among other things, reworkthe thermal driver interface for binding cooling devices to thermalzones and add a thermal core testing module: - Update some thermal drivers to eliminate thermal_zone_get_trip() calls from them and get rid of that function (Rafael Wysocki). - Update the thermal sysfs code to store trip point attributes in trip descriptors and get to trip points via attribute pointers (Rafael Wysocki). - Move the computation of the low and high boundaries for thermal_zone_set_trips() to __thermal_zone_device_update() (Daniel Lezcano). - Introduce a debugfs-based facility for thermal core testing (Rafael Wysocki). - Replace the thermal zone .bind() and .unbind() callbacks for binding cooling devices to thermal zones with one .should_bind() callback used for deciding whether or not a given cooling devices should be bound to a given trip point in a given thermal zone (Rafael Wysocki). - Eliminate code that has no more users after the other changes, drop some redundant checks from the thermal core and clean it up (Rafael Wysocki). - Fix rounding of delay jiffies in the thermal core (Rafael Wysocki).* thermal-core: (31 commits) thermal: core: Drop tz field from struct thermal_instance thermal: core: Drop redundant checks from thermal_bind_cdev_to_trip() thermal: core: Rename cdev-to-thermal-zone bind/unbind functions thermal: core: Fix rounding of delay jiffies thermal: core: Clean up trip bind/unbind functions thermal: core: Drop unused bind/unbind functions and callbacks thermal/of: Use the .should_bind() thermal zone callback thermal: imx: Use the .should_bind() thermal zone callback mlxsw: core_thermal: Use the .should_bind() thermal zone callback platform/x86: acerhdf: Use the .should_bind() thermal zone callback thermal: core: Unexport thermal_bind_cdev_to_trip() and thermal_unbind_cdev_from_trip() thermal: ACPI: Use the .should_bind() thermal zone callback thermal: core: Introduce .should_bind() thermal zone callback thermal: core: Move thermal zone locking out of bind/unbind functions thermal: sysfs: Use the dev argument in instance-related show/store thermal: core: Drop redundant thermal instance checks thermal: core: Rearrange checks in thermal_bind_cdev_to_trip() thermal: core: Fold two functions into their respective callers thermal: Introduce a debugfs-based testing facility thermal/core: Compute low and high boundaries in thermal_zone_device_update() ... List of files: /linux/drivers/thermal/testing/Makefile

f6a034f2df426e279f1ecad53626bab80c04796a - thermal: Introduce a debugfs-based testing facility

Thu, 22 Aug 2024 17:42:57 +0200

thermal: Introduce a debugfs-based testing facilityIntroduce a facility allowing the thermal core functionality to beexercised in a controlled way in order to verify its behavior, withoutaffecting its regular users noticeably.It is based on the idea of preparing thermal zone templates along withtheir trip points by writing to files in debugfs. When ready, thosetemplates can be used for registering test thermal zones with thethermal core.The temperature of a test thermal zone created this way can be adjustedvia debugfs, which also triggers a __thermal_zone_device_update() callfor it. By manipulating the temperature of a test thermal zone, one cancheck if the thermal core reacts to the changes of it as expected.Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/6065927.lOV4Wx5bFT@rjwysocki.net[ rjw: Fixed ordering of kcalloc() arguments ][ rjw: Fixed debugfs_create_dir() return value checks ][ rjw: Fixed two kerneldoc comments ]Signed-off-by: Rafael J. Wysocki List of files: /linux/drivers/thermal/testing/Makefile