Hi Alexei, On Thu, 13 Feb 2025 21:33:11 -0800 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote: > > what should we do ? > I feel that moving c83e2d970bae into bpf tree would be the best ? Just remember to mention the conflict to whomever merges the bpf-next tree towards Linus' tree. Its a trivial conflict. Or merge the bpf tree into the bpf-next tree if you feel that you need the bug fixes in the bpf-next tree as well. -- Cheers, Stephen Rothwell
Attachment:
pgpR0zHH_Gy9O.pgp
Description: OpenPGP digital signature
