On 4/15/25 9:53 AM, Jiayuan Chen wrote: > April 16, 2025 at 24:33, "Ihor Solodrai" <ihor.solodrai@xxxxxxxxx> wrote: >> >> "sockmap_ktls disconnect_after_delete" test has been failing on BPF CI >> after recent merges from netdev: >> * https://github.com/kernel-patches/bpf/actions/runs/14458537639 >> * https://github.com/kernel-patches/bpf/actions/runs/14457178732 >> It happens because disconnect has been disabled for TLS [1], and it >> renders the test case invalid. Remove it from the suite. >> [1] https://lore.kernel.org/netdev/20250404180334.3224206-1-kuba@xxxxxxxxxx/ >> Signed-off-by: Ihor Solodrai <ihor.solodrai@xxxxxxxxx> > > Reviewed-by: Jiayuan Chen <jiayuan.chen@xxxxxxxxx> > > The original selftest patch used disconnect to re-produce the endless > loop caused by tcp_bpf_unhash, which has already been removed. > > I hope this doesn't conflict with bpf-next... I just tried applying to bpf-next, and it does indeed have a conflict... Although kdiff3 merged it automatically. What's the right way to resolve this? Send for bpf-next?
