Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1158330

Re: linux-next: manual merge of the edac-amd tree with the tip tree

Show all headers | View raw

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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the edac-amd tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-04 09:00 +0200
  Re: linux-next: manual merge of the edac-amd tree with the tip tree Borislav Petkov <bp@alien8.de> - 2015-06-04 10:10 +0200

csiph-web