From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754240AbcEQNim (ORCPT <rfc822;w@1wt.eu>);
	Tue, 17 May 2016 09:38:42 -0400
Received: from foss.arm.com ([217.140.101.70]:51933 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750875AbcEQNik (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 17 May 2016 09:38:40 -0400
Date: Tue, 17 May 2016 14:38:35 +0100
From: Catalin Marinas <catalin.marinas@arm.com>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        Linux-Next <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Yang Shi <yang.shi@linaro.org>, Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree
Message-ID: <20160517133834.GF23555@e104818-lin.cambridge.arm.com>
References: <20160517102441.0cfbc192@canb.auug.org.au>
 <CAMuHMdX8oW2M8Rr_LUHNSi9PMyEoNOdsp4MrN5z3SySjfahFmw@mail.gmail.com>
 <573AC462.7070809@iogearbox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <573AC462.7070809@iogearbox.net>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

-- 
Catalin