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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170703113732.6af8235d@canb.auug.org.au>
Date:   Mon, 3 Jul 2017 11:37:32 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Catalin Marinas <catalin.marinas@....com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Luc Van Oostenryck <luc.vanoostenryck@...il.com>,
        Will Deacon <will.deacon@....com>,
        Daniel Borkmann <daniel@...earbox.net>
Subject: linux-next: manual merge of the net-next tree with the arm64 tree

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)