lkml.org 
[lkml]   [2015]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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.
--


\
 
 \ /
  Last update: 2015-06-04 10:21    [W:0.038 / U:0.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site