From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbcEQHDL (ORCPT ); Tue, 17 May 2016 03:03:11 -0400 Received: from mail-io0-f175.google.com ([209.85.223.175]:35827 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754865AbcEQHDF (ORCPT ); Tue, 17 May 2016 03:03:05 -0400 MIME-Version: 1.0 In-Reply-To: <20160517102441.0cfbc192@canb.auug.org.au> References: <20160517102441.0cfbc192@canb.auug.org.au> Date: Tue, 17 May 2016 09:03:04 +0200 X-Google-Sender-Auth: pJjweuoEecTdhYv_lufqa1BGbu8 Message-ID: Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree From: Geert Uytterhoeven To: Stephen Rothwell Cc: David Miller , "netdev@vger.kernel.org" , Catalin Marinas , Linux-Next , "linux-kernel@vger.kernel.org" , Daniel Borkmann , Yang Shi , Will Deacon Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 17, 2016 at 2:24 AM, Stephen Rothwell 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