From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>, bpf <bpf@vger•kernel.org>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Palmer Dabbelt <palmer@rivosinc•com>,
Pu Lehui <pulehui@huawei•com>,
Samuel Holland <samuel.holland@sifive•com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the risc-v tree
Date: Wed, 10 Jul 2024 13:26:29 +1000 [thread overview]
Message-ID: <20240710132629.781c55e4@canb.auug.org.au> (raw)
In-Reply-To: <20240702113350.064e4cf2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]
Hi all,
On Tue, 2 Jul 2024 11:33:50 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> arch/riscv/net/bpf_jit_comp64.c
>
> between commit:
>
> 51781ce8f448 ("riscv: Pass patch_text() the length in bytes")
>
> from the risc-v tree and commit:
>
> 9f1e16fb1fc9 ("riscv, bpf: Fix out-of-bounds issue when preparing trampoline image")
>
> from the bpf-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/riscv/net/bpf_jit_comp64.c
> index 7a34e5b44fc4,351e1484205e..000000000000
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@@ -16,7 -16,8 +16,9 @@@
> #include "bpf_jit.h"
>
> #define RV_FENTRY_NINSNS 2
> +#define RV_FENTRY_NBYTES (RV_FENTRY_NINSNS * 4)
> + /* imm that allows emit_imm to emit max count insns */
> + #define RV_MAX_COUNT_IMM 0x7FFF7FF7FF7FF7FF
>
> #define RV_REG_TCC RV_REG_A6
> #define RV_REG_TCC_SAVED RV_REG_S6 /* Store A6 in S6 if program do calls */
This is now a conflict between the risc-v tree and the net-next tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-07-10 3:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 1:33 linux-next: manual merge of the bpf-next tree with the risc-v tree Stephen Rothwell
2024-07-10 3:26 ` Stephen Rothwell [this message]
2024-07-17 23:59 ` Stephen Rothwell
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=20240710132629.781c55e4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=pulehui@huawei$(echo .)com \
--cc=samuel.holland@sifive$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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