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 S1754984AbcEQNtQ (ORCPT <rfc822;w@1wt.eu>);
	Tue, 17 May 2016 09:49:16 -0400
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
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 17 May 2016 09:49:14 -0400
Message-ID: <573B2151.5010907@iogearbox.net>
Date: Tue, 17 May 2016 15:49:05 +0200
From: Daniel Borkmann <daniel@iogearbox.net>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
MIME-Version: 1.0
To: Catalin Marinas <catalin.marinas@arm.com>
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
References: <20160517102441.0cfbc192@canb.auug.org.au> <CAMuHMdX8oW2M8Rr_LUHNSi9PMyEoNOdsp4MrN5z3SySjfahFmw@mail.gmail.com> <573AC462.7070809@iogearbox.net> <20160517133834.GF23555@e104818-lin.cambridge.arm.com>
In-Reply-To: <20160517133834.GF23555@e104818-lin.cambridge.arm.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
X-Authenticated-Sender: daniel@iogearbox.net
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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).