| Message ID | 20230322223637.25584-3-michael.reed@canonical.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=f5PcXzlq; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Phjyb46QSz247w for <incoming@patchwork.ozlabs.org>; Thu, 23 Mar 2023 09:37:11 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1pf74b-0004Zt-D7; Wed, 22 Mar 2023 22:36:49 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <michael.reed@canonical.com>) id 1pf74V-0004YU-63 for kernel-team@lists.ubuntu.com; Wed, 22 Mar 2023 22:36:43 +0000 Received: from mail-oo1-f72.google.com (mail-oo1-f72.google.com [209.85.161.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id EDC4C4187C for <kernel-team@lists.ubuntu.com>; Wed, 22 Mar 2023 22:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1679524602; bh=nz1DoWubzP0gkJDhzbY174wICScv3go6bfKivPBd0UE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f5PcXzlqEbEJMFaO8L0S0k2b8wkKxekW69Fpro1lVNC11usdHBygSVVkv8CKfk3sm uu1e16rbAdYz3S4Fhnv2Z/hytfhSRJgm2bmCXKU52wa1i963ceIFYXlNUHRmFz9g+C NvT5QY6RCAavdKNRnHz1GfwB453RU52waicSURIDbMFzuu3atykC9nhAf4qQviXodW xKD2NIcoXyJTbuC2x2s8ewfSdWN3pcclmBLmpSOGbizlriOWDlS7/0rqGU6rX6t7p5 zJt++PGIfQlYIzs1oVUDuiWb1uVHhKE4l2LsnAU1Bs1vTRsh/tzByqyuHQdbmigJIL XJ7Os1yZLlZTQ== Received: by mail-oo1-f72.google.com with SMTP id bv19-20020a0568201b1300b0053727cb901bso6420876oob.0 for <kernel-team@lists.ubuntu.com>; Wed, 22 Mar 2023 15:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679524601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nz1DoWubzP0gkJDhzbY174wICScv3go6bfKivPBd0UE=; b=4GsBy0MTQXWCgXjnLYJwCM7vBRQiIIMsLy4Mk0MnMj+X5M/j6Qib2kiKyvjnoL7WJV BN7JRIhi3DMd+elbtVIQ7sy1mzx9LCAESivfz7KUkxlQVLcFC5hd6sdtT9kZXaISiHVU JD1DWK5QEvGI8jl7Zz0sc95oQ4Iv3IClhnenD2jOemeAOokYM+Sx5Xc+Frl/ePdd7Gf0 lcGdjh0qrvVYid2MNsihYB5H79m9DMwq9Ev+2LX1Qmuyx5OvbU3OjZJzDvcDj5DIM+Y7 r9lFiOqWKoaz8KXj6+RY8O3FxzkudjfjHJr8Zx8uVtJ1MWOp+mDCvKsSZ5z0f19sdBw3 lJpw== X-Gm-Message-State: AAQBX9fbBgztVJqQPMnHFzy2DEvKHH60mARmUIzyJVpfVQK3dklhKaA8 X/XneWb0QThr3ogO1s7NVitRH5vQV74HVHk0UixT3hW/cTOqIpdPtQEf7LQ7LFd5DT0ckJ+4Hyl /Lrp95JxA7HUSNT+ipPYNWUWuR5WrVVwNEOukI+fxPNVl4fbT3w== X-Received: by 2002:a05:6870:891b:b0:17e:8e0c:62f1 with SMTP id i27-20020a056870891b00b0017e8e0c62f1mr607874oao.7.1679524601243; Wed, 22 Mar 2023 15:36:41 -0700 (PDT) X-Google-Smtp-Source: AKy350braPl3BOfpHju3r+y8COXJn0VbPKrmWdVEPcWHulNCrJC3cQRWdzLlE3RHIgAOWJtXcK94jg== X-Received: by 2002:a05:6870:891b:b0:17e:8e0c:62f1 with SMTP id i27-20020a056870891b00b0017e8e0c62f1mr607862oao.7.1679524600919; Wed, 22 Mar 2023 15:36:40 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:349:bcfc:2d9b:e5b1]) by smtp.gmail.com with ESMTPSA id r5-20020a056830120500b0069f74706056sm642513otp.9.2023.03.22.15.36.40 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 15:36:40 -0700 (PDT) From: Michael Reed <michael.reed@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [SRU J][PATCH 2/2] watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING Date: Wed, 22 Mar 2023 17:36:37 -0500 Message-Id: <20230322223637.25584-3-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230322223637.25584-1-michael.reed@canonical.com> References: <20230322223637.25584-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
| Series |
Backport request for hpwdt from upstream 6.1 to Jammy
|
expand
|
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index a5006a58e0db..f79f932bca14 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -20,7 +20,9 @@ #include <linux/pci_ids.h> #include <linux/types.h> #include <linux/watchdog.h> +#ifdef CONFIG_HPWDT_NMI_DECODING #include <asm/nmi.h> +#endif #include <linux/crash_dump.h> #define HPWDT_VERSION "2.0.4"