Hi all, On Tue, 2 Jul 2024 11:33:50 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgpF2eqtIuzdM.pgp
Description: OpenPGP digital signature