Message ID | 20230420191947.12021-4-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=hFmOycJP; 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 4Q2SCs1T9fz1ybF for <incoming@patchwork.ozlabs.org>; Fri, 21 Apr 2023 05:20:07 +1000 (AEST) 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 1ppZp1-0005Di-A2; Thu, 20 Apr 2023 19:19:59 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.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 1ppZoz-0005Co-EJ for kernel-team@lists.ubuntu.com; Thu, 20 Apr 2023 19:19:57 +0000 Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) (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-0.canonical.com (Postfix) with ESMTPS id CC8783F19A for <kernel-team@lists.ubuntu.com>; Thu, 20 Apr 2023 19:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1682018396; bh=nz1DoWubzP0gkJDhzbY174wICScv3go6bfKivPBd0UE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hFmOycJP2yuS8Pn1suPbT5qbFxYrWpx+P9rtXy4mbHTv396QnHpMaQ2Czk3YCL91q 6Ku0Mg+3feGPT5wa2C1d5voetUb6RXUztABfAz6vmDNzXeT2oiQ12C3MVpe8i67cMK JdNTHJBvmvRdaqjDt6kYQJ7tXHlx58lDOqPFL+da56F995ug5kZ9HTyKnp9Ify5qCW d9AcQoG26uBENBtOVlSVNlZEa9BKsbFj6fqTxP5ZEbtZOtZQDCeg5KcM641UdDWHGX LRgWudls61XvVnmrnYHf+a+M5b9HWCfaNDHA8Cv+pnge39xS0h5JuxSU7nt7S6C2Co Quz3du34wPXFw== Received: by mail-ot1-f69.google.com with SMTP id 46e09a7af769-6a3e08f6232so375688a34.0 for <kernel-team@lists.ubuntu.com>; Thu, 20 Apr 2023 12:19:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682018395; x=1684610395; 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=GfjJAhevuV+Ch1DzZe8VUERhO364GMHGhGMaAdDEAtG4HTLnvAgTCs4vVOsNb0FN/0 X2Ye8lTxcR89A8ND+mjNHngvw0tGEk9E9LoBOcD4e4tHMJHnU/X+SfYxzi//MFzVBJCk +csf3884PrOYYsM94RmYYG1ohjM4C+YqlriNngOu6zxSs4IYBv+IatgVqvQov+LSXL4G 1QuwA8EFq5eWulQN/RmqV7QCwzv+HZkjQA73T6edrZW/fQbhPtIZYNmat96wnzQT+9Zu Mb50AyOgmz1w/prQNqBNnKNbgNZVFDRM2OpNEQCSrkXNtynqdm4uDmtYHmuibnHkgX8w Q1oA== X-Gm-Message-State: AAQBX9fGKqi64+vJ/4lDCviBcWvU16Z06Dv3VXmg/rAA7DuMnXjZZnzw Ma4jSNkTYIgiA6SYX0kuWQZ8sZOc3/r1lKIw2PQP1JNOeIRLG7NrWEsNSgEhx4VDNb74mJryazk ijb01RctxJka2rHAqfo9R/gT1Xc1sPlMTwFCNNOPAOZ46LgiBDg== X-Received: by 2002:a9d:6b01:0:b0:6a6:814:478c with SMTP id g1-20020a9d6b01000000b006a60814478cmr1338721otp.28.1682018394897; Thu, 20 Apr 2023 12:19:54 -0700 (PDT) X-Google-Smtp-Source: AKy350YhNQPpmMf5O5neEeH/wD6ocLjmTJSAkrnx8Dowu2adGpwbkDRoNtO/S52AOKMpBeKE6g6AMw== X-Received: by 2002:a9d:6b01:0:b0:6a6:814:478c with SMTP id g1-20020a9d6b01000000b006a60814478cmr1338709otp.28.1682018394597; Thu, 20 Apr 2023 12:19:54 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:dd30:1444:7da:3b03]) by smtp.gmail.com with ESMTPSA id z13-20020a9d62cd000000b006a2cc609ddasm1058088otk.2.2023.04.20.12.19.53 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 12:19:54 -0700 (PDT) From: Michael Reed <michael.reed@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [SRU J/K][PATCH V3 3/3] watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING Date: Thu, 20 Apr 2023 14:19:47 -0500 Message-Id: <20230420191947.12021-4-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420191947.12021-1-michael.reed@canonical.com> References: <20230420191947.12021-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"