2012-08-23 02:44:09

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the tip tree with the rr tree

---

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 [email protected]

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"

---

Attachments:

(No filename) (1.22 kB)
(No filename) (836.00 B)
Download all attachments

2012-08-23 10:52:14

by Frederic Weisbecker

[permalink] [raw]

Subject: Re: linux-next: manual merge of the tip tree with the rr tree

---

On Thu, Aug 23, 2012 at 12:43:48PM +1000, Stephen Rothwell wrote:
> 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 [email protected]

Looks good, thanks!

>
> 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"