linux-next: manual merge of the bpf-next tree with the risc-v tree

Commit Message

Stephen Rothwell July 2, 2024, 1:33 a.m. UTC

Hi all,

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.

Patch

diff --cc arch/riscv/net/bpf_jit_comp64.c
index 7a34e5b44fc4,351e1484205e..000000000000
--- a/arch/riscv/net/bpf_jit_comp64.c