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

[Mark Brown]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  arch/arm64/net/bpf_jit_comp.c

between commit:

  17637e1a581a2 ("bpf: Skip detached progs in trampoline images that are still in use")

from the bpf tree and commits:

  1d5306c11da2d ("bpf, arm64: Allow programs 2 KiB of stack")
  11a516144d9a8 ("bpf, arm64: Add JIT support for callx")

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.

diff --cc arch/arm64/net/bpf_jit_comp.c
index 8108012cd7e4a,475e706534543..0000000000000
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@@ -2413,11 -2498,20 +2493,21 @@@ bool bpf_jit_supports_subprog_tailcalls
  	return true;
  }
  
+ bool bpf_jit_supports_callx(void)
+ {
+ 	return true;
+ }
+ 
+ bool bpf_jit_supports_large_stack(void)
+ {
+ 	return true;
+ }
+ 
 -static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_node *node,
 -			    int bargs_off, int retval_off, int run_ctx_off,
 -			    bool save_ret)
 +static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_image *im,
 +			    struct bpf_tramp_node *node, int bargs_off,
 +			    int retval_off, int run_ctx_off, bool save_ret)
  {
 +	void *skip;
  	__le32 *branch;
  	u64 enter_prog;
  	u64 exit_prog;

Attachment: signature.asc
Description: PGP signature