From: Palmer Dabbelt <palmer@dabbelt.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, akpm@linux-foundation.org
Cc: Paul Walmsley <paul@pwsan.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
zong.li@sifive.com, rppt@linux.ibm.com
Subject: Re: linux-next: manual merge of the akpm-current tree with the rsic-v tree
Date: Thu, 28 May 2020 12:19:35 -0700 (PDT) [thread overview]
Message-ID: <mhng-42a49fa7-9216-40d3-9862-d5bed0d97eec@palmerdabbelt-glaptop1> (raw)
In-Reply-To: <20200528192211.2449bd4f@canb.auug.org.au>
On Thu, 28 May 2020 02:22:11 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/riscv/Kconfig
>
> between commit:
>
> b151fefd23b7 ("riscv: sort select statements alphanumerically")
Andrew: Maybe it's easier if just drop the patch? It comes from a script, so I
can just resurrect it when things are less busy.
>
> from the rsic-v tree and commits:
>
> e8d3552c4f20 ("mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option")
> 4d01b8e6220f ("riscv: support DEBUG_WX")
>
> from the akpm-current 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/riscv/Kconfig
> index de5c95119de9,68418201734a..000000000000
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@@ -12,47 -12,29 +12,47 @@@ config 32BI
>
> config RISCV
> def_bool y
> - select OF
> - select OF_EARLY_FLATTREE
> - select OF_IRQ
> select ARCH_HAS_BINFMT_FLAT
> + select ARCH_HAS_DEBUG_VIRTUAL if MMU
> + select ARCH_HAS_DEBUG_WX
> + select ARCH_HAS_GCOV_PROFILE_ALL
> + select ARCH_HAS_GIGANTIC_PAGE
> + select ARCH_HAS_MMIOWB
> + select ARCH_HAS_PTE_SPECIAL
> + select ARCH_HAS_SET_DIRECT_MAP
> + select ARCH_HAS_SET_MEMORY
> + select ARCH_HAS_STRICT_KERNEL_RWX if MMU
> + select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
> select ARCH_WANT_FRAME_POINTERS
> + select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
> select CLONE_BACKWARDS
> select COMMON_CLK
> + select EDAC_SUPPORT
> + select GENERIC_ARCH_TOPOLOGY if SMP
> + select GENERIC_ATOMIC64 if !64BIT
> select GENERIC_CLOCKEVENTS
> + select GENERIC_IOREMAP
> + select GENERIC_IRQ_MULTI_HANDLER
> select GENERIC_IRQ_SHOW
> select GENERIC_PCI_IOMAP
> + select GENERIC_PTDUMP if MMU
> select GENERIC_SCHED_CLOCK
> + select GENERIC_SMP_IDLE_THREAD
> select GENERIC_STRNCPY_FROM_USER if MMU
> select GENERIC_STRNLEN_USER if MMU
> - select GENERIC_SMP_IDLE_THREAD
> - select GENERIC_ATOMIC64 if !64BIT
> - select GENERIC_IOREMAP
> - select GENERIC_PTDUMP if MMU
> select HAVE_ARCH_AUDITSYSCALL
> + select HAVE_ARCH_KASAN if MMU && 64BIT
> + select HAVE_ARCH_KGDB
> + select HAVE_ARCH_KGDB_QXFER_PKT
> + select HAVE_ARCH_MMAP_RND_BITS if MMU
> select HAVE_ARCH_SECCOMP_FILTER
> + select HAVE_ARCH_TRACEHOOK
> select HAVE_ASM_MODVERSIONS
> + select HAVE_COPY_THREAD_TLS
> select HAVE_DMA_CONTIGUOUS if MMU
> + select HAVE_EBPF_JIT if MMU
> select HAVE_FUTEX_CMPXCHG if FUTEX
> - select HAVE_MEMBLOCK_NODE_MAP
> + select HAVE_PCI
> select HAVE_PERF_EVENTS
> select HAVE_PERF_REGS
> select HAVE_PERF_USER_STACK_DUMP
next prev parent reply other threads:[~2020-05-28 19:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 9:22 linux-next: manual merge of the akpm-current tree with the rsic-v tree Stephen Rothwell
2020-05-28 19:19 ` Palmer Dabbelt [this message]
2020-05-29 21:18 ` Andrew Morton
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=mhng-42a49fa7-9216-40d3-9862-d5bed0d97eec@palmerdabbelt-glaptop1 \
--to=palmer@dabbelt.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=rppt@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=zong.li@sifive.com \
/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).