ITADN

Rebase for 6.19.5?

#141Closedxarblu 创建于 2026-03-01
X
xarblucommented
Hi, I'm maintaining a 3rd party port of the cachyos-kernel for Gentoo (https://github.com/xarblu/xarblu-overlay/tree/master/sys-kernel/cachyos-kernel). Currently the patches don't apply onto 6.19.5 with these hunks failing: ``` patching file include/net/netfilter/nf_tables.h Hunk #1 FAILED at 456. Hunk #2 FAILED at 513. 2 out of 2 hunks FAILED -- 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 Hunk #1 FAILED at 7702. 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/nf_tables_api.c.rej patching file net/netfilter/nft_set_pipapo.c Hunk #1 FAILED at 2370. Hunk #2 FAILED at 2394. 2 out of 2 hunks FAILED -- saving rejects to file net/netfilter/nft_set_pipapo.c.rej ``` Which (I think) is because `6.19/0004-fixes.patch` and thus `6.19/all/0001-cachyos-base-all.patch` includes a fix that is upstreamed in 6.19.5 (https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.19.y&id=50e2f41c2ced7b89083d6c8c597b0f00e9718279 to be specific). Or is `0001-cachyos-base-all.patch` now somewhat "deprecated" in favour of grabbing full tarballs from https://github.com/CachyOS/linux/releases? (https://github.com/CachyOS/linux-cachyos/commit/2ec81c9098229de0b8d8e346f665d4a2ec0b807e kind of suggests that is the case, although I'd really prefer to just grab a patch over full 250mb tarballs for each release)
关闭于 2026-03-02 2 条评论