Skip to content
Snippets Groups Projects
Commit 0f3144ba authored by Augusto Caringi's avatar Augusto Caringi
Browse files

Merge: Update drivers/thermal/intel, include thermal_of fix

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6390

JIRA: https://issues.redhat.com/browse/RHEL-79821



The following upstream commits were not applied due to scope:

66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper
4a62d588a84e thermal: core: Eliminate writable trip points masks
dd64594ca2c5 thermal: Switch back to struct platform_driver::remove()
cdd30ebb1b9f module: Convert symbol namespace to string literal

Upstream commit 423de5b5bc5b is included in this patchset as it provides
a fix for upstream 94c6110b0b13 which was included in a recent update to
drivers/thermal

Signed-off-by: default avatarDavid Arcari <darcari@redhat.com>

Approved-by: default avatarSteve Best <sbest@redhat.com>
Approved-by: default avatarTony Camuso <tcamuso@redhat.com>
Approved-by: default avatarCKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: default avatarAugusto Caringi <acaringi@redhat.com>
parents 21694632 01e82d40
No related branches found
No related tags found
No related merge requests found
Showing
with 57 additions and 79 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment