linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Borkmann <daniel@iogearbox.net>
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
Date: Tue, 17 May 2016 15:49:05 +0200	[thread overview]
Message-ID: <573B2151.5010907@iogearbox.net> (raw)
In-Reply-To: <20160517133834.GF23555@e104818-lin.cambridge.arm.com>

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

  reply	other threads:[~2016-05-17 13:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-17  0:24 linux-next: manual merge of the net-next tree with the arm64 tree Stephen Rothwell
2016-05-17  6:05 ` Daniel Borkmann
2016-05-17  7:03 ` Geert Uytterhoeven
2016-05-17  7:12   ` Daniel Borkmann
2016-05-17 13:38     ` Catalin Marinas
2016-05-17 13:49       ` Daniel Borkmann [this message]
2017-07-03  1:37 Stephen Rothwell
2017-07-03  7:54 ` Daniel Borkmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=573B2151.5010907@iogearbox.net \
    --to=daniel@iogearbox.net \
    --cc=catalin.marinas@arm.com \
    --cc=davem@davemloft.net \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=will.deacon@arm.com \
    --cc=yang.shi@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).