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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120823105200.GA18835@somewhere.redhat.com>
Date:	Thu, 23 Aug 2012 12:52:04 +0200
From:	Frederic Weisbecker <fweisbec@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Rusty Russell <rusty@...tcorp.com.au>
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                    sfr@...b.auug.org.au

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"


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/