From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5E82C77B7A for ; Fri, 19 May 2023 21:28:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229449AbjESV25 (ORCPT ); Fri, 19 May 2023 17:28:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229602AbjESV24 (ORCPT ); Fri, 19 May 2023 17:28:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F8B0F2 for ; Fri, 19 May 2023 14:28:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2AAD965B34 for ; Fri, 19 May 2023 21:28:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BCB0C433D2; Fri, 19 May 2023 21:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1684531734; bh=HGk8iX1nX6XbteymQQosFXrTJ8pJraJa99vf1bYYac8=; h=Date:To:From:Subject:From; b=ndVnfpb1z1oWC2gsgUSZ3xfzxfEouHACXgIiFsvLyRp+qnPKzhSc7C2f6Foh8rg7M wbsqPF//HvzH1fr6prZtmkT6Z7aqIsvyqg+TYouhk7yR4TKmebuVK5rGsVLKhmdil1 iuETX4TVgK2OMrZXNxN+AetHkwZ7qtgUJgeJEFbw= Date: Fri, 19 May 2023 14:28:53 -0700 To: mm-commits@vger.kernel.org, will@kernel.org, wens@csie.org, tzungbi@chromium.org, swboyd@chromium.org, sumit.garg@linaro.org, ricardo.neri@intel.com, rdunlap@infradead.org, ravi.v.shankar@intel.com, pmladek@suse.com, npiggin@gmail.com, msys.mizuma@gmail.com, mpe@ellerman.id.au, mka@chromium.org, maz@kernel.org, mark.rutland@arm.com, kernelfans@gmail.com, irogers@google.com, groeck@chromium.org, eranian@google.com, dianders@chromium.org, davem@davemloft.net, daniel.thompson@linaro.org, christophe.leroy@csgroup.eu, ccross@android.com, catalin.marinas@arm.com, ak@linux.intel.com, lecopzer.chen@mediatek.com, akpm@linux-foundation.org From: Andrew Morton Subject: + watchdog-remove-watchdog_default.patch added to mm-nonmm-unstable branch Message-Id: <20230519212854.7BCB0C433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: watchdog: remove WATCHDOG_DEFAULT has been added to the -mm mm-nonmm-unstable branch. Its filename is watchdog-remove-watchdog_default.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/watchdog-remove-watchdog_default.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Lecopzer Chen Subject: watchdog: remove WATCHDOG_DEFAULT Date: Fri, 19 May 2023 10:18:27 -0700 No reference to WATCHDOG_DEFAULT, remove it. Link: https://lkml.kernel.org/r/20230519101840.v5.3.I6a729209a1320e0ad212176e250ff945b8f91b2a@changeid Signed-off-by: Pingfan Liu Signed-off-by: Lecopzer Chen Signed-off-by: Douglas Anderson Reviewed-by: Petr Mladek Cc: Andi Kleen Cc: Catalin Marinas Cc: Chen-Yu Tsai Cc: Christophe Leroy Cc: Colin Cross Cc: Daniel Thompson Cc: "David S. Miller" Cc: Guenter Roeck Cc: Ian Rogers Cc: Marc Zyngier Cc: Mark Rutland Cc: Masayoshi Mizuma Cc: Matthias Kaehlcke Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Randy Dunlap Cc: "Ravi V. Shankar" Cc: Ricardo Neri Cc: Stephane Eranian Cc: Stephen Boyd Cc: Sumit Garg Cc: Tzung-Bi Shih Cc: Will Deacon Signed-off-by: Andrew Morton --- kernel/watchdog.c | 2 -- 1 file changed, 2 deletions(-) --- a/kernel/watchdog.c~watchdog-remove-watchdog_default +++ a/kernel/watchdog.c @@ -30,10 +30,8 @@ static DEFINE_MUTEX(watchdog_mutex); #if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG) -# define WATCHDOG_DEFAULT (SOFT_WATCHDOG_ENABLED | NMI_WATCHDOG_ENABLED) # define NMI_WATCHDOG_DEFAULT 1 #else -# define WATCHDOG_DEFAULT (SOFT_WATCHDOG_ENABLED) # define NMI_WATCHDOG_DEFAULT 0 #endif _ Patches currently in -mm which might be from lecopzer.chen@mediatek.com are watchdog-remove-watchdog_default.patch watchdog-hardlockup-change-watchdog_nmi_enable-to-void.patch watchdog-perf-adapt-the-watchdog_perf-interface-for-async-model.patch arm64-add-hw_nmi_get_sample_period-for-preparation-of-lockup-detector.patch