From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbeECVDR (ORCPT ); Thu, 3 May 2018 17:03:17 -0400 Received: from g9t1613g.houston.hpe.com ([15.241.32.99]:20016 "EHLO g9t1613g.houston.hpe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbeECVDO (ORCPT ); Thu, 3 May 2018 17:03:14 -0400 From: Jerry Hoemann To: wim@linux-watchdog.org, linux@roeck-us.net Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH 0/1] watchdog/hpwdt: Claim NMIs generated by iLO5 Date: Thu, 3 May 2018 15:00:54 -0600 Message-Id: <20180503210055.32483-1-jerry.hoemann@hpe.com> X-Mailer: git-send-email 2.13.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Guenter, In v4 of my Febuary patch series: https://lkml.org/lkml/2018/2/25/201 I had a merge error in hpwdt.c that causes hpwdt to not claim NMIs that it should on iLO5 (i.e. Gen10) systems. The Feb patches were recently picked up for 4.17-rc2. Not sure the appropriate action here. The merge error ocurred on: https://lkml.org/lkml/2018/2/25/203 And was carried forward through out the remaining patches in the series. We could ask for patches to be reverted and reworked. Or, we can apply a 1-line fix. If the latter, here is the 1-line fix. Jerry Hoemann (1): watchdog: hpwdt: Claim NMIs generated by iLO5 drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.6