Re: pull-request: bpf-next 2019-12-27

[Björn Töpel <bjorn.topel@xxxxxxxxx>]

On Fri, 27 Dec 2019 at 19:08, Daniel Borkmann <daniel@xxxxxxxxxxxxx> wrote:
>
[...]
>
> 2) Merge conflict in arch/riscv/net/bpf_jit_comp.c:
>
> (I'm keeping Bjorn in Cc here for a double-check in case I got it wrong.)
>
>   <<<<<<< HEAD
>           if (is_13b_check(off, insn))
>                   return -1;
>           emit(rv_blt(tcc, RV_REG_ZERO, off >> 1), ctx);
>   =======
>           emit_branch(BPF_JSLT, RV_REG_T1, RV_REG_ZERO, off, ctx);
>   >>>>>>> 7c8dce4b166113743adad131b5a24c4acc12f92c
>
> Result should look like:
>
>           emit_branch(BPF_JSLT, tcc, RV_REG_ZERO, off, ctx);
>

That's correct. Thanks, Daniel, for the fixup (over the holiday)!


Happy holidays,
Björn