From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Borkmann Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree Date: Tue, 17 May 2016 15:49:05 +0200 Message-ID: <573B2151.5010907@iogearbox.net> References: <20160517102441.0cfbc192@canb.auug.org.au> <573AC462.7070809@iogearbox.net> <20160517133834.GF23555@e104818-lin.cambridge.arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from www62.your-server.de ([213.133.104.62]:42133 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750792AbcEQNtO (ORCPT ); Tue, 17 May 2016 09:49:14 -0400 In-Reply-To: <20160517133834.GF23555@e104818-lin.cambridge.arm.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Catalin Marinas Cc: Geert Uytterhoeven , Stephen Rothwell , David Miller , "netdev@vger.kernel.org" , Linux-Next , "linux-kernel@vger.kernel.org" , Yang Shi , Will Deacon On 05/17/2016 03:38 PM, Catalin Marinas wrote: > On Tue, May 17, 2016 at 09:12:34AM +0200, Daniel Borkmann wrote: >> On 05/17/2016 09:03 AM, Geert Uytterhoeven wrote: >> [...] >>> Someone's not gonna be happy with commit 6077776b5908 ("bpf: split >>> HAVE_BPF_JIT into cBPF and eBPF variant") breaking the sort order again... >> >> Wasn't aware of that. Maybe I'm missing something, but there appears >> to be no throughout consistent ordering ... >> >> [...] >> select HAVE_PERF_REGS >> select HAVE_PERF_USER_STACK_DUMP >> select HAVE_RCU_TABLE_FREE >> select HAVE_SYSCALL_TRACEPOINTS >> select IOMMU_DMA if IOMMU_SUPPORT >> select IRQ_DOMAIN >> select IRQ_FORCED_THREADING >> [...] >> select RTC_LIB >> select SPARSE_IRQ >> select SYSCTL_EXCEPTION_TRACE >> select HAVE_CONTEXT_TRACKING >> select HAVE_ARM_SMCCC >> [...] > > We keep fixing them as we merge other stuff. For example, latest > mainline has commit 8ee708792e1c ("arm64: Kconfig: remove redundant > HAVE_ARCH_TRANSPARENT_HUGEPAGE definition") which also fixes up the > Kconfig order. Understood, thanks for the clarification (and sorry for the sort order issue).