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>,
Frederic Weisbecker <fweisbec@gmail•com>
Subject: linux-next: manual merge of the tip tree with the rr tree
Date: Thu, 23 Aug 2012 12:43:48 +1000 [thread overview]
Message-ID: <20120823124348.831760a775f7bcb9c8e26219@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
between commit bd029f48459a ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree and commit b952741c8079
("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") from the tip tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/Kconfig
index 3450115,ea5feb6..0000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -281,23 -294,7 +294,26 @@@ config SECCOMP_FILTE
See Documentation/prctl/seccomp_filter.txt for details.
+config HAVE_MOD_ARCH_SPECIFIC
+ bool
+ help
+ The arch uses struct mod_arch_specific to store data. Many arches
+ just need a simple module loader without arch specific data - those
+ should not enable this.
+
+config MODULES_USE_ELF_RELA
+ bool
+ help
+ Modules only use ELF RELA relocations. Modules with ELF REL
+ relocations will give an error.
+
+config MODULES_USE_ELF_REL
+ bool
+ help
+ Modules only use ELF REL relocations. Modules with ELF RELA
+ relocations will give an error.
+
+ config HAVE_VIRT_CPU_ACCOUNTING
+ bool
+
source "kernel/gcov/Kconfig"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-08-23 2:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-23 2:43 Stephen Rothwell [this message]
2012-08-23 10:52 ` linux-next: manual merge of the tip tree with the rr tree Frederic Weisbecker
-- strict thread matches above, loose matches on Subject: below --
2012-09-28 3:38 Stephen Rothwell
2012-09-28 3:33 Stephen Rothwell
2012-09-28 12:39 ` 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=20120823124348.831760a775f7bcb9c8e26219@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=fweisbec@gmail$(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