Frogging-Family / linux-tkg

linux-tkg custom kernels
GNU General Public License v2.0
1.34k stars 171 forks source link

community patch AMD_CPPC.mypatch does not apply to 5.15.x #690

Closed mabod closed 1 year ago

mabod commented 1 year ago

This for endeavourOS.

I wanted to add amd_pstate support to latest kernel 5.15 with community patch AMD_CPPC.mypatch https://github.com/Frogging-Family/community-patches/tree/master/linux515-tkg

But it does not apply cleanly:

/tmp/tmp.QuE4d5ceaq/linux-tkg/linux515-tkg-userpatches/AMD_CPPC.mypatch
Do you want to install it/them? - Be careful with that ;)
> N/y : y
  -> ######################################################
  -> 
  -> Applying your own linux-5.15 patch /tmp/tmp.QuE4d5ceaq/linux-tkg/linux515-tkg-userpatches/AMD_CPPC.mypatch
  -> 
  -> ######################################################
patching file arch/x86/include/asm/cpufeatures.h
Hunk #1 FAILED at 315.
1 out of 1 hunk FAILED -- saving rejects to file arch/x86/include/asm/cpufeatures.h.rej
patching file arch/x86/include/asm/msr-index.h
Hunk #1 succeeded at 530 (offset 44 lines).
patching file drivers/acpi/cppc_acpi.c
Hunk #1 succeeded at 128 (offset 10 lines).
Hunk #2 succeeded at 770 (offset 22 lines).
Hunk #3 succeeded at 964 (offset 22 lines).
Hunk #4 succeeded at 1017 (offset 22 lines).
patching file drivers/acpi/cppc_acpi.c
Hunk #1 succeeded at 1297 (offset 22 lines).
patching file include/acpi/cppc_acpi.h
patching file drivers/cpufreq/Kconfig.x86
patching file drivers/cpufreq/Makefile
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/Makefile
patching file drivers/cpufreq/amd-pstate-trace.c
patching file drivers/cpufreq/amd-pstate-trace.h
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/amd-pstate.c
patching file Documentation/admin-guide/acpi/cppc_sysfs.rst
patching file Documentation/admin-guide/pm/amd-pstate.rst
patching file Documentation/admin-guide/pm/working-state.rst
patching file MAINTAINERS
Hunk #1 succeeded at 987 (offset -6 lines).
patching file drivers/cpufreq/amd-pstate.c
patching file drivers/cpufreq/Kconfig.x86
patching file tools/power/cpupower/utils/helpers/helpers.h
patching file tools/power/cpupower/utils/helpers/helpers.h
patching file tools/power/cpupower/utils/helpers/misc.c
patching file tools/power/cpupower/utils/helpers/cpuid.c
patching file tools/power/cpupower/lib/cpufreq.c
patching file tools/power/cpupower/lib/cpufreq.h
patching file tools/power/cpupower/Makefile
patching file tools/power/cpupower/lib/acpi_cppc.c
patching file tools/power/cpupower/lib/acpi_cppc.h
patching file tools/power/cpupower/utils/helpers/amd.c
patching file tools/power/cpupower/utils/helpers/amd.c
patching file tools/power/cpupower/utils/helpers/helpers.h
patching file tools/power/cpupower/utils/helpers/misc.c
patching file tools/power/cpupower/utils/cpufreq-info.c
patching file tools/power/cpupower/utils/helpers/helpers.h
patching file tools/power/cpupower/utils/helpers/misc.c
patching file tools/power/cpupower/utils/cpufreq-info.c
patching file tools/power/cpupower/utils/helpers/amd.c
patching file tools/power/cpupower/utils/helpers/helpers.h
==> FEHLER: Ein Fehler geschah in prepare().
    Breche ab...
  -> exit cleanup done
Tk-Glitch commented 1 year ago

Thanks, will fix