CachyOS/linux-cachyos

0001-cachyos-base-all fails when applied to 6.11

Closed this issue · 2 comments

==> Starting prepare()...
Setting version...
Applying patch 0001-cachyos-base-all.patch...
patching file Documentation/admin-guide/pm/amd-pstate.rst
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file Documentation/admin-guide/pm/amd-pstate.rst.rej
patching file arch/x86/include/asm/cpufeatures.h
Hunk #1 FAILED at 470.
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
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file arch/x86/include/asm/msr-index.h.rej
patching file arch/x86/kernel/cpu/scattered.c
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file arch/x86/kernel/cpu/scattered.c.rej
patching file drivers/cpufreq/Kconfig.x86
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/cpufreq/Kconfig.x86.rej
patching file drivers/cpufreq/acpi-cpufreq.c
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file drivers/cpufreq/acpi-cpufreq.c.rej
patching file drivers/cpufreq/amd-pstate.c
Reversed (or previously applied) patch detected!  Skipping patch.
38 out of 38 hunks ignored -- saving rejects to file drivers/cpufreq/amd-pstate.c.rej
patching file drivers/cpufreq/amd-pstate.h
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/cpufreq/amd-pstate.h.rej
patching file drivers/cpufreq/cpufreq.c
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file drivers/cpufreq/cpufreq.c.rej
patching file include/linux/tcp.h
patching file include/net/inet_c

and more!

https://paste.cachyos.org/p/0e4faba.txt works for me on system and on chroot. Make sure you have the updated file and not the file that was previously fetched locally for a prior kernel version. Also make sure you're clean building.

@1Naim thanks, I didn't pay attention to git status correctly! Hopefully this fixes the wayland-nvidia stuttering issues!!

==> Leaving fakeroot environment.
==> Finished making: linux-cachyos 6.11.0-1 (Mon 16 Sep 2024 12:03:07 AM EDT)