From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752567AbcD2QrE (ORCPT ); Fri, 29 Apr 2016 12:47:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:48714 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814AbcD2QrC (ORCPT ); Fri, 29 Apr 2016 12:47:02 -0400 Date: Fri, 29 Apr 2016 18:46:52 +0200 From: Borislav Petkov To: Linus Torvalds Cc: linux-edac , lkml Subject: [GIT PULL] EDAC fix for 4.6 Message-ID: <20160429164652.GD19964@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, please pull the tag below. Thanks. --- The following changes since commit 02da2d72174c61988eb4456b53f405e3ebdebce4: Linux 4.6-rc5 (2016-04-24 16:17:05 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_fix_for_4.6 for you to fetch changes up to c4fc1956fa31003bfbe4f597e359d751568e2954: EDAC: i7core, sb_edac: Don't return NOTIFY_BAD from mce_decoder callback (2016-04-29 15:43:10 +0200) ---------------------------------------------------------------- Make sure sb_edac and i7core_edac do not terminate MCE processing on the decoding callchain prematurely. ---------------------------------------------------------------- Tony Luck (1): EDAC: i7core, sb_edac: Don't return NOTIFY_BAD from mce_decoder callback drivers/edac/i7core_edac.c | 2 +- drivers/edac/sb_edac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 01087a38da22..792bdae2b91d 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -1866,7 +1866,7 @@ static int i7core_mce_check_error(struct notifier_block *nb, unsigned long val, i7_dev = get_i7core_dev(mce->socketid); if (!i7_dev) - return NOTIFY_BAD; + return NOTIFY_DONE; mci = i7_dev->mci; pvt = mci->pvt_info; diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 468447aff8eb..8bf745d2da7e 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -3168,7 +3168,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val, mci = get_mci_for_node_id(mce->socketid); if (!mci) - return NOTIFY_BAD; + return NOTIFY_DONE; pvt = mci->pvt_info; /* -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg) --