From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>
Cc: Frederic Weisbecker <frederic@kernel.org>,
Huacai Chen <chenhuacai@kernel.org>,
Huacai Chen <chenhuacai@loongson.cn>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: linux-next: manual merge of the rcu tree with Linus' tree
Date: Fri, 8 Jul 2022 14:12:46 +1000 [thread overview]
Message-ID: <20220708141246.43111241@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
arch/loongarch/Kconfig
between commit:
7fd6ef61a5d6 ("LoongArch: Drop these obsolete selects in Kconfig")
from Linus' tree and commit:
24a9c54182b3 ("context_tracking: Split user tracking Kconfig")
from the rcu 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/loongarch/Kconfig
index 53a912befb62,130dc65f3c85..000000000000
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@@ -75,7 -76,8 +75,7 @@@ config LOONGARC
select HAVE_ARCH_TRACEHOOK
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
select HAVE_ASM_MODVERSIONS
- select HAVE_CONTEXT_TRACKING
+ select HAVE_CONTEXT_TRACKING_USER
- select HAVE_COPY_THREAD_TLS
select HAVE_DEBUG_STACKOVERFLOW
select HAVE_DMA_CONTIGUOUS
select HAVE_EXIT_THREAD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-07-08 4:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 4:12 Stephen Rothwell [this message]
2022-07-08 15:23 ` linux-next: manual merge of the rcu tree with Linus' tree Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2022-10-17 22:41 Stephen Rothwell
2022-10-18 18:38 ` Paul E. McKenney
2018-06-12 0:46 Stephen Rothwell
2018-06-12 1:01 ` Paul E. McKenney
2018-06-18 3:48 ` Stephen Rothwell
2018-06-18 3:49 ` Stephen Rothwell
2018-06-18 14:48 ` Paul E. McKenney
2018-05-14 3:46 Stephen Rothwell
2018-05-15 17:44 ` Paul E. McKenney
2017-09-26 3:00 Stephen Rothwell
2017-09-26 3:26 ` Paul E. McKenney
2017-09-26 3:42 ` Stephen Rothwell
2017-03-08 0:46 Stephen Rothwell
2017-03-08 0:56 ` Stephen Rothwell
2016-03-30 0:32 Stephen Rothwell
2016-03-30 10:30 ` Paul E. McKenney
2016-03-30 0:23 Stephen Rothwell
2012-11-29 3:06 Stephen Rothwell
2012-11-29 22:12 ` Paul E. McKenney
2012-08-06 2:31 Stephen Rothwell
2011-09-27 6:04 Stephen Rothwell
2011-09-27 12:20 ` Frederic Weisbecker
2011-09-27 5:14 Stephen Rothwell
2011-09-27 13:14 ` Borislav Petkov
2010-10-06 2:38 Stephen Rothwell
2010-10-06 4:17 ` Paul E. McKenney
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=20220708141246.43111241@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chenhuacai@kernel.org \
--cc=chenhuacai@loongson.cn \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=paulmck@kernel.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).