linux-kernel - Re: linux-next: manual merge of the edac-amd tree with the tip 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]

Date:	Thu, 4 Jun 2015 10:01:51 +0200
From:	Borislav Petkov <bp@...en8.de>
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
Subject: Re: linux-next: manual merge of the edac-amd tree with the tip tree

On Thu, Jun 04, 2015 at 04:55:29PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the edac-amd tree got a conflict in
> arch/x86/Kconfig between commit 6471b825c41e ("x86/kconfig: Reorganize
> arch feature Kconfig select's") from the tip tree and commit
> b01aec9b2c7d ("EDAC: Cleanup atomic_scrub mess") from the edac-amd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Ah yes, the two new EDAC Kconfig items from the EDAC tree and the
sorting of the selects from the tip tree:

...
>  +    select COMPAT_OLD_SIGACTION             if IA32_EMULATION
>  +    select DCACHE_WORD_ACCESS
> ++    select EDAC_ATOMIC_SCRUB
> ++    select EDAC_SUPPORT
>  +    select GENERIC_CLOCKEVENTS
>  +    select GENERIC_CLOCKEVENTS_BROADCAST    if X86_64 || (X86_32 && X86_LOCAL_APIC)
...

Looks good to me, thanks Stephen!

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
--
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/