Hi Ingo and Thomas-
There's a trivial conflict in the pull request I sent last week.
--Andy
---------- Forwarded message ----------
From: Borislav Petkov <bp@xxxxxxx>
Date: Mon, Jan 19, 2015 at 1:35 AM
Subject: Re: linux-next: manual merge of the luto-misc tree with the tip tree
To: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>, "Luck, Tony"
<tony.luck@xxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
On Mon, Jan 19, 2015 at 05:08:39PM +1100, Stephen Rothwell wrote:
> Hi Andy,
>
> Today's linux-next merge of the luto-misc tree got a conflict in
> arch/x86/kernel/cpu/mcheck/mce.c between commit 83737691e586 ("x86,
> mce: Fix sparse errors") from the tip tree and commit d4812e169de4
> ("x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks") from
> the luto-misc tree.
>
> I fixed it up (the latter removed some of the code changed by the
> former) and can carry the fix as necessary (no action is required).
That must be the piece of the hunk touching mce_info. Yes, the correct
solution is to follow what d4812e169de4 does.
Thanks Stephen :)
---
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 800d423f1e92..d23179900755 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1004,51 +1004,6 @@ static void mce_clear_state(unsigned long *toclear)
}
/*
- * Need to save faulting physical address associated with a process
- * in the machine check handler some place where we can grab it back
- * later in mce_notify_process()
- */
-#define MCE_INFO_MAX 16
-
-struct mce_info {
- atomic_t inuse;
- struct task_struct *t;
- __u64 paddr;
- int restartable;
-} mce_info[MCE_INFO_MAX];
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
--
Andy Lutomirski
AMA Capital Management, LLC
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
