From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>,
Rusty Russell <rusty@rustcorp•com.au>
Subject: linux-next: manual merge of the tip tree with the rr tree
Date: Fri, 28 Sep 2012 13:38:16 +1000 [thread overview]
Message-ID: <20120928133816.85dd67a7276558b9a7e574d5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit 9a9d5786a5e7 ("Make most arch
asm/module.h files use asm-generic/module.h") from the rr tree and
commits fdf9c356502a ("cputime: Make finegrained irqtime accounting
generally available") and edf55fda35c7 ("x86: Exit RCU extended QS on
notify resume") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/x86/Kconfig
index ede3e92,56e7a25..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -97,11 -102,12 +102,14 @@@ config X8
select KTIME_SCALAR if X86_32
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
+ select MODULES_USE_ELF_REL if X86_32
+ select MODULES_USE_ELF_RELA if X86_64
+ select HAVE_RCU_USER_QS if X86_64
+ select HAVE_IRQ_TIME_ACCOUNTING
config INSTRUCTION_DECODER
- def_bool (KPROBES || PERF_EVENTS || UPROBES)
+ def_bool y
+ depends on KPROBES || PERF_EVENTS || UPROBES
config OUTPUT_FORMAT
string
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-28 3:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 3:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-28 3:33 linux-next: manual merge of the tip tree with the rr tree Stephen Rothwell
2012-09-28 12:39 ` Frederic Weisbecker
2012-08-23 2:43 Stephen Rothwell
2012-08-23 10:52 ` Frederic Weisbecker
2009-09-03 8:25 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=20120928133816.85dd67a7276558b9a7e574d5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tglx@linutronix$(echo .)de \
/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