From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>, Paul Walmsley <paul@pwsan•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Amanieu d'Antras <amanieu@gmail•com>,
Christian Brauner <christian.brauner@ubuntu•com>,
Nick Hu <nickhu@andestech•com>,
Vincent Chen <vincent.chen@sifive•com>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Date: Tue, 14 Jan 2020 09:05:20 +1100 [thread overview]
Message-ID: <20200114090520.1be304e2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1348 bytes --]
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/Kconfig
between commit:
20bda4ed62f5 ("riscv: Implement copy_thread_tls")
from Linus' tree and commit:
d0f057940663 ("riscv: Add KASAN support")
5b800fd350d6 ("riscv: add required functions to enable HAVE_REGS_AND_STACK_ACCESS_API")
a630fb824cf5 ("riscv: Add support for restartable sequence")
from the risc-v 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 fa7dc03459e7,9220071bb7da..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -65,7 -63,9 +63,10 @@@ config RISC
select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
select HAVE_ARCH_MMAP_RND_BITS if MMU
select ARCH_HAS_GCOV_PROFILE_ALL
+ select HAVE_COPY_THREAD_TLS
+ select HAVE_ARCH_KASAN if MMU && 64BIT
+ select HAVE_REGS_AND_STACK_ACCESS_API
+ select HAVE_RSEQ
config ARCH_MMAP_RND_BITS_MIN
default 18 if 64BIT
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-01-13 22:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 22:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-08 0:36 linux-next: manual merge of the risc-v tree with Linus' tree Stephen Rothwell
2025-08-08 0:33 Stephen Rothwell
2025-01-31 0:42 Stephen Rothwell
2025-01-31 0:39 Stephen Rothwell
2024-09-18 0:05 Stephen Rothwell
2024-05-22 23:17 Stephen Rothwell
2024-05-23 6:54 ` Yangyu Chen
2024-05-15 23:36 Stephen Rothwell
2024-05-16 2:17 ` Yangyu Chen
2024-05-16 4:40 ` Stephen Rothwell
2024-02-11 22:55 Stephen Rothwell
2024-01-07 22:49 Stephen Rothwell
2024-01-11 17:20 ` Palmer Dabbelt
2023-11-02 22:14 Stephen Rothwell
2023-08-30 23:29 Stephen Rothwell
2023-08-31 17:50 ` Nick Desaulniers
2023-09-01 15:46 ` Palmer Dabbelt
2023-08-30 23:25 Stephen Rothwell
2023-07-04 23:46 Stephen Rothwell
2023-06-04 22:51 Stephen Rothwell
2023-02-05 22:48 Stephen Rothwell
2023-02-05 22:40 Stephen Rothwell
2023-02-05 22:43 ` Stephen Rothwell
2023-01-08 21:42 Stephen Rothwell
2022-12-12 23:03 Stephen Rothwell
2022-10-13 22:11 Stephen Rothwell
2022-07-24 23:33 Stephen Rothwell
2022-03-22 22:06 Stephen Rothwell
2021-12-19 22:47 Stephen Rothwell
2021-07-05 23:32 Stephen Rothwell
2021-06-14 23:26 Stephen Rothwell
2021-04-26 23:42 Stephen Rothwell
2021-03-30 22:40 Stephen Rothwell
2021-04-02 4:33 ` Palmer Dabbelt
2021-02-23 22:00 Stephen Rothwell
2020-10-25 22:01 Stephen Rothwell
2020-01-05 22:32 Stephen Rothwell
2020-01-06 1:50 ` Paul Walmsley
2020-01-06 1:55 ` Stephen Rothwell
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=20200114090520.1be304e2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amanieu@gmail$(echo .)com \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nickhu@andestech$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=vincent.chen@sifive$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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