From: Borislav Petkov <bp@alien8.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the edac-amd tree with the tip tree
Date: Thu, 4 Jun 2015 10:01:51 +0200 [thread overview]
Message-ID: <20150604080151.GB3795@pd.tnic> (raw)
In-Reply-To: <20150604165529.04d35606@canb.auug.org.au>
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.
--
next prev parent reply other threads:[~2015-06-04 8:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 6:55 linux-next: manual merge of the edac-amd tree with the tip tree Stephen Rothwell
2015-06-04 8:01 ` Borislav Petkov [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-11 3:28 Stephen Rothwell
2011-02-11 8:47 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150604080151.GB3795@pd.tnic \
--to=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox