On Tue, Apr 30, 2024 at 09:05:28AM -0700, Easwar Hariharan wrote: > On 4/29/2024 4:53 AM, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > The patch below does not apply to the 5.15-stable tree. > > If someone wants it applied there, or to any other stable or longterm > > tree, then please email the backport, including the original git commit > > id to <stable@xxxxxxxxxxxxxxx>. > > > > To reproduce the conflict and resubmit, you may use the following commands: > > > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y > > git checkout FETCH_HEAD > > git cherry-pick -x f489c948028b69cea235d9c0de1cc10eeb26a172 > > # <resolve conflicts, build, test, etc.> > > git commit -s > > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024042905-puppy-heritage-e422@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. > > > > Possible dependencies: > > > > f489c948028b ("ACPI: CPPC: Fix access width used for PCC registers") > > 2f4a4d63a193 ("ACPI: CPPC: Use access_width over bit_width for system memory accesses") > > 0651ab90e4ad ("ACPI: CPPC: Check _OSC for flexible address space") > > c42fa24b4475 ("ACPI: bus: Avoid using CPPC if not supported by firmware") > > 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"") > > f684b1075128 ("ACPI: CPPC: Drop redundant local variable from cpc_read()") > > 5f51c7ce1dc3 ("ACPI: CPPC: Fix up I/O port access in cpc_read()") > > a2c8f92bea5f ("ACPI: CPPC: Implement support for SystemIO registers") > > > > thanks, > > > > greg k-h > > > > Hi Greg, > > Please fix this with the following set of changes in linux-5.15.y. > > Revert b54c4632946ae42f2b39ed38abd909bbf78cbcc2 from linux-5.15.y > Cherry-pick 05d92ee782eeb7b939bdd0189e6efcab9195bf95 from upstream > Pick the following backport of f489c948028b69cea235d9c0de1cc10eeb26a172 from upstream Please provide a series of patches that I can apply that does this, attempting to revert and cherry-pick and then manually hand-edit this email and apply it does not scale at all, sorry. thanks, greg k-h