From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@suse.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cleanups] x86/nmi: Remove edac.h include leftover
Date: Sat, 16 May 2020 05:55:37 -0000 [thread overview]
Message-ID: <158960853783.17951.15482412371733766732.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200515182246.3553-1-bp@alien8.de>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 6255c161a08564e4f3995db31f3d64a5fd24738b
Gitweb: https://git.kernel.org/tip/6255c161a08564e4f3995db31f3d64a5fd24738b
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Fri, 15 May 2020 20:21:21 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Sat, 16 May 2020 07:47:57 +02:00
x86/nmi: Remove edac.h include leftover
... which
db47d5f85646 ("x86/nmi, EDAC: Get rid of DRAM error reporting thru PCI SERR NMI")
forgot to remove.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200515182246.3553-1-bp@alien8.de
---
arch/x86/kernel/nmi.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 6407ea2..bdcc514 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -25,10 +25,6 @@
#include <linux/atomic.h>
#include <linux/sched/clock.h>
-#if defined(CONFIG_EDAC)
-#include <linux/edac.h>
-#endif
-
#include <asm/cpu_entry_area.h>
#include <asm/traps.h>
#include <asm/mach_traps.h>
prev parent reply other threads:[~2020-05-16 5:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 18:22 [PATCH] " Borislav Petkov
2020-05-16 5:55 ` tip-bot2 for Borislav Petkov [this message]
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=158960853783.17951.15482412371733766732.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/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
all inboxes | Powered by JetHome®