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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26B5EC433E1 for ; Wed, 19 Aug 2020 12:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 035B2206FA for ; Wed, 19 Aug 2020 12:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597840344; bh=cEIKgXw3BDmfrCdZRpKlYzQxypL4iFsL0d58dmh8Fu0=; h=Subject:To:Cc:From:Date:List-ID:From; b=OhlENwz/I4AbkNefUNuNVjlzdzYhqjjUdKah9PSioP0ycoufBiIMLPW7/PL/90Qpl 5h6cruHnjNNhVOJFDnon43BAr1MVp2CFS2PEveWZJ/9sPOsiMM0h3JGXNraqdUv6ST 6yAR0o9HAuglYeCtm2L3SNdMX2Od6yPXIFe0Nl3c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727046AbgHSMcX (ORCPT ); Wed, 19 Aug 2020 08:32:23 -0400 Received: from wforward3-smtp.messagingengine.com ([64.147.123.22]:34761 "EHLO wforward3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726952AbgHSMcV (ORCPT ); Wed, 19 Aug 2020 08:32:21 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.west.internal (Postfix) with ESMTP id 7590495B; Wed, 19 Aug 2020 08:32:20 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 19 Aug 2020 08:32:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=1sutNu jIOllIIH/mSPeEZYe6C9FQMOGt7cWbvyyMyFI=; b=OjEaYFGlgZiD68MBI3K0Rt nhtEQD7Ti0sOvzDX49gSGJhaLQn5hdfLDapBLHyTq9Qa7QHfH8aBSKGck0QcAXeH ZJ5ge8LS4W7odyee3appc7Cuv+Sxe83VH35t70oBvptSsYVjse93IG/8XRnviSqz CMzcPz9NQy5ddtczSVAqzF1YcTKfRfta6AE/y3uVG4v2nDldkUv7utjeRHGBPhtu EGIWLor3TZLF+H2IUNjptiwIXvcpJEno9xtUD2Cv5b1VSlHB0oQ7+f7zarWVSQ/n fWcMp+DEH3cj9o+KZbCPDFceLy3n69ozz+SXh4+LlU5ncurATqd0dSO7Pm8BgPmw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddtkedgfeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepleelledvgeefleeltdetgedugeffgffhudffudduke egfeelgeeigeekjefhleevnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphep keefrdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 0464E30600B2; Wed, 19 Aug 2020 08:32:18 -0400 (EDT) Subject: FAILED: patch "[PATCH] watchdog: f71808e_wdt: remove use of wrong watchdog_info" failed to apply to 4.4-stable tree To: a.fatoum@pengutronix.de, linux@roeck-us.net, wim@linux-watchdog.org Cc: From: Date: Wed, 19 Aug 2020 14:32:42 +0200 Message-ID: <1597840362204192@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 802141462d844f2e6a4d63a12260d79b7afc4c34 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Thu, 11 Jun 2020 21:17:44 +0200 Subject: [PATCH] watchdog: f71808e_wdt: remove use of wrong watchdog_info option The flags that should be or-ed into the watchdog_info.options by drivers all start with WDIOF_, e.g. WDIOF_SETTIMEOUT, which indicates that the driver's watchdog_ops has a usable set_timeout. WDIOC_SETTIMEOUT was used instead, which expands to 0xc0045706, which equals: WDIOF_FANFAULT | WDIOF_EXTERN1 | WDIOF_PRETIMEOUT | WDIOF_ALARMONLY | WDIOF_MAGICCLOSE | 0xc0045000 These were so far indicated to userspace on WDIOC_GETSUPPORT. As the driver has not yet been migrated to the new watchdog kernel API, the constant can just be dropped without substitute. Fixes: 96cb4eb019ce ("watchdog: f71808e_wdt: new watchdog driver for Fintek F71808E and F71882FG") Cc: stable@vger.kernel.org Signed-off-by: Ahmad Fatoum Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20200611191750.28096-4-a.fatoum@pengutronix.de Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index c8ce80c13403..8e5584c54423 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -690,8 +690,7 @@ static int __init watchdog_init(int sioaddr) * into the module have been registered yet. */ watchdog.sioaddr = sioaddr; - watchdog.ident.options = WDIOC_SETTIMEOUT - | WDIOF_MAGICCLOSE + watchdog.ident.options = WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | WDIOF_CARDRESET;