From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753814Ab1HHDsQ (ORCPT ); Sun, 7 Aug 2011 23:48:16 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:43993 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753725Ab1HHDsO (ORCPT ); Sun, 7 Aug 2011 23:48:14 -0400 Date: Mon, 8 Aug 2011 13:48:08 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Hidetoshi Seto Subject: linux-next: manual merge of the i7300_edac tree with Linus' tree Message-Id: <20110808134808.263962c573bcffac2e28a003@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0beta1 (GTK+ 2.24.5; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mauro, Today's linux-next merge of the i7300_edac tree got a conflict in arch/x86/kernel/cpu/mcheck/mce.c between commit b77e70bf3535 ("x86, mce: Replace MCE_SELF_VECTOR by irq_work") from Linus' tree and commit cd90cc84c6bf ("i7core_edac: Drop the edac_mce facility") from the i7300_edac tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/x86/kernel/cpu/mcheck/mce.c index 08363b0,9c03d98..0000000 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@@ -36,10 -37,12 +36,9 @@@ #include #include #include - #include +#include #include -#include -#include -#include -#include #include #include