mirror of
https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
synced 2026-09-09 00:08:12 +08:00
CKI KWF Bot
3a09f7251f
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/8694 JIRA: https://redhat.atlassian.net/browse/RHEL-241103 Standard recurring update of drivers/platform/x86/intel Three commits applied in 9.9 were reverted to be applied again in this MR in original order. With the exception of commit7c9b994d84and263024f0d1, all conflicts and contextual differences are from removing quotes from symbol namespace imports/exports due to missing upstream commit cdd30ebb1b9f ("module: Convert symbol namespace to string literal") Commit7c9b994d84("platform/x86/intel-uncore-freq: Expose instance ID in the sysfs") has a simple contextual difference in documentation. Commit263024f0d1("platform/x86/intel/vsec: allocate res with intel_vsec_dev") has a conflict due to missing upstream *alloc_obj conversion. Signed-off-by: Dennis Chen <dechen@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Desnes Nunes <desnesn@redhat.com> Approved-by: Anusha Srivatsa <asrivats@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>