[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the net-next tree with the arm64 tree
On 07/03/2017 03:37 AM, Stephen Rothwell wrote:
> 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.

Looks good to me, thanks!

 \ /
  Last update: 2017-07-03 09:56    [W:0.029 / U:0.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site