From: "Björn Töpel" <bjorn.topel@gmail.com>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Miller <davem@davemloft.net>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Alexei Starovoitov <ast@kernel.org>,
Netdev <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: pull-request: bpf-next 2019-12-27
Date: Fri, 27 Dec 2019 20:07:33 +0100 [thread overview]
Message-ID: <CAJ+HfNhW=tWdAD0jUyNCE7+Hby6874JAr8bfJHnc+edFLQExRg@mail.gmail.com> (raw)
In-Reply-To: <20191227180817.30438-1-daniel@iogearbox.net>
On Fri, 27 Dec 2019 at 19:08, Daniel Borkmann <daniel@iogearbox.net> 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
next prev parent reply other threads:[~2019-12-27 19:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-27 18:08 pull-request: bpf-next 2019-12-27 Daniel Borkmann
2019-12-27 19:07 ` Björn Töpel [this message]
2019-12-27 22:20 ` David Miller
2019-12-27 23:28 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ+HfNhW=tWdAD0jUyNCE7+Hby6874JAr8bfJHnc+edFLQExRg@mail.gmail.com' \
--to=bjorn.topel@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).