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

Groups > linux.kernel > #1402139

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

Show all headers | View raw

On Tue, May 17, 2016 at 2:24 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>   arch/arm64/Kconfig
>
> between commit:
>
>   8ee708792e1c ("arm64: Kconfig: remove redundant HAVE_ARCH_TRANSPARENT_HUGEPAGE definition")
>
> from the arm64 tree and commit:
>
>   6077776b5908 ("bpf: split HAVE_BPF_JIT into cBPF and eBPF variant")
>
> 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/Kconfig
> index 8845c0d100d7,e6761ea2feec..000000000000
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@@ -59,9 -58,7 +59,9 @@@ config ARM6
>         select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT
>         select HAVE_ARCH_SECCOMP_FILTER
>         select HAVE_ARCH_TRACEHOOK
>  +      select HAVE_ARCH_TRANSPARENT_HUGEPAGE
>  +      select HAVE_ARM_SMCCC
> -       select HAVE_BPF_JIT
> +       select HAVE_EBPF_JIT
>         select HAVE_C_RECORDMCOUNT
>         select HAVE_CC_STACKPROTECTOR
>         select HAVE_CMPXCHG_DOUBLE

Someone's not gonna be happy with commit 6077776b5908 ("bpf: split
HAVE_BPF_JIT into cBPF and eBPF variant") breaking the sort order again...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Back to linux.kernel | Previous | Next — Previous in thread | 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> - 2016-05-17 02:30 +0200
  Re: linux-next: manual merge of the net-next tree with the arm64  tree Daniel Borkmann <daniel@iogearbox.net> - 2016-05-17 08:10 +0200
  Re: linux-next: manual merge of the net-next tree with the arm64 tree Geert Uytterhoeven <geert@linux-m68k.org> - 2016-05-17 09:10 +0200
    Re: linux-next: manual merge of the net-next tree with the arm64  tree Daniel Borkmann <daniel@iogearbox.net> - 2016-05-17 09:20 +0200
      Re: linux-next: manual merge of the net-next tree with the arm64 tree Catalin Marinas <catalin.marinas@arm.com> - 2016-05-17 15:40 +0200
        Re: linux-next: manual merge of the net-next tree with the arm64  tree Daniel Borkmann <daniel@iogearbox.net> - 2016-05-17 15:50 +0200

csiph-web