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

On 05/07/2018 06:10 AM, Stephen Rothwell wrote: > On Mon, 7 May 2018 12:09:09 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the tip tree got a conflict in: >> >> arch/x86/net/bpf_jit_comp.c >> >> between commit: >> >> e782bdcf58c5 ("bpf, x64: remove ld_abs/ld_ind") >> >> f

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

Hi all, On Mon, 7 May 2018 12:09:09 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/net/bpf_jit_comp.c > > between commit: > > e782bdcf58c5 ("bpf, x64: remove ld_abs/ld_ind") > > from the bpf-next tree and commit: > > 5f26c501