Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1679597

linux-next: manual merge of the net-next tree with the arm64 tree

Show all headers | View raw

Hi all,

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

  arch/arm64/net/bpf_jit_comp.c

between commit:

  425e1ed73e65 ("arm64: fix endianness annotation for 'struct jit_ctx' and friends")

from the arm64 tree and commit:

  f1c9eed7f437 ("bpf, arm64: take advantage of stack_depth tracking")

from the net-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/arm64/net/bpf_jit_comp.c
index 8860bb9c33a1,2f0505b5c240..000000000000
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@@ -70,7 -70,8 +70,8 @@@ struct jit_ctx 
  	int idx;
  	int epilogue_offset;
  	int *offset;
 -	u32 *image;
 +	__le32 *image;
+ 	u32 stack_size;
  };
  
  static inline void emit(const u32 insn, struct jit_ctx *ctx)

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-03 03:40 +0200
  Re: linux-next: manual merge of the net-next tree with the arm64  tree Daniel Borkmann <daniel@iogearbox.net> - 2017-07-03 10:00 +0200

csiph-web