ITADN

0004-fixes.patch for 6.19 does not apply cleanly to 6.19.5 sources

#142Closednetarchy 创建于 2026-03-03
N
netarchycommented
The 6.19 patch 0004-fixes.patch does not apply cleanly to 6.19.5 sources. This also affects using the 0001-cachyos-base-all.patch. patches 0001 through 0008 otherwise apply cleanly in series. It appears to have issues with nf_tables.h, nf_tables_api.c, and nft_set_pipapo.c Example output: ------ netarchy@linphetamine:~/rpmbuild/SOURCES/linux-6.19.5$ patch -p1 < ../0004-fixes.patch patching file arch/arm/include/asm/mmu_context.h patching file arch/riscv/include/asm/sync_core.h patching file arch/s390/include/asm/mmu_context.h patching file arch/sparc/include/asm/mmu_context_64.h patching file arch/x86/include/asm/mmu_context.h patching file arch/x86/include/asm/sync_core.h patching file arch/x86/kernel/cpu/amd.c patching file arch/x86/mm/tlb.c patching file drivers/bluetooth/btusb.c patching file drivers/gpu/drm/amd/amdgpu/amdgpu_device.c patching file drivers/gpu/drm/i915/gt/intel_rc6.c patching file drivers/iommu/iommu.c patching file drivers/usb/core/quirks.c patching file include/linux/perf_event.h patching file include/linux/sched/mm.h patching file include/linux/sched/topology.h patching file include/linux/tick.h patching file include/linux/vtime.h patching file include/net/netfilter/nf_tables.h Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 2 out of 2 hunks ignored -- saving rejects to file include/net/netfilter/nf_tables.h.rej patching file kernel/rcu/tree.c patching file kernel/sched/core.c patching file kernel/sched/ext.c patching file kernel/sched/fair.c patching file kernel/sched/features.h patching file kernel/sched/sched.h patching file kernel/sched/topology.c patching file net/netfilter/nf_tables_api.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file net/netfilter/nf_tables_api.c.rej patching file net/netfilter/nft_set_pipapo.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 2 out of 2 hunks ignored -- saving rejects to file net/netfilter/nft_set_pipapo.c.rej patching file sound/hda/codecs/realtek/alc269.c ------
关闭于 2026-03-03 1 条评论