Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1158330
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Borislav Petkov <bp@alien8.de> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the edac-amd tree with the tip tree |
| Date | Thu, 04 Jun 2015 10:10:02 +0200 |
| Message-ID | <pxynU-37f-17@gated-at.bofh.it> (permalink) |
| References | <pxxia-1jd-17@gated-at.bofh.it> |
| X-Original-To | Stephen Rothwell <sfr@canb.auug.org.au> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1433404912; bh=h4HTtAlOaHRl+JoXTHgumkjuilTovsVkl7AQ1mR3ESg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=dVqCEizgWiGOiylvLnv9xdLVSFwQMwK2tfNNSt n3jdhFEhWphGW/T9Nxk19Gso9BUrV/zvpba2p5XGu/Av1I+259z3+lvQoHNj4EkZUh9 5B502pRrwoia8bJXDCkqLoY/ryH/RtMASwOv8IMz0XqxKrxZ0sW8357KLKB0R1uE6g= |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1433404912; bh=h4HTtAlOaHRl+JoXTHgumkjuilTovsVkl7AQ1mR3ESg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=dVqCEizgWiGOiylvLnv9xdLVSFwQMwK2tfNNSt n3jdhFEhWphGW/T9Nxk19Gso9BUrV/zvpba2p5XGu/Av1I+259z3+lvQoHNj4EkZUh9 5B502pRrwoia8bJXDCkqLoY/ryH/RtMASwOv8IMz0XqxKrxZ0sW8357KLKB0R1uE6g= |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=utf-8 |
| Content-Disposition | inline |
| User-Agent | Mutt/1.5.23 (2014-03-12) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 34 |
| Organization | linux.* mail to news gateway |
| X-Original-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 |
| X-Original-Date | Thu, 4 Jun 2015 10:01:51 +0200 |
| X-Original-Message-ID | <20150604080151.GB3795@pd.tnic> |
| X-Original-References | <20150604165529.04d35606@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | aioe.org linux.kernel:1158330 |
Show key headers only | 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
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