Received: by 10.223.176.5 with SMTP id f5csp2840372wra; Mon, 5 Feb 2018 10:45:00 -0800 (PST) X-Google-Smtp-Source: AH8x2255YR4SahVxC/Wbbx5+Cz0dLbsB/T8z3Ey//ER1aLU+0YnXLkyGDhbTSlaIywHSWsnC7m16 X-Received: by 10.98.220.6 with SMTP id t6mr10954928pfg.20.1517856300834; Mon, 05 Feb 2018 10:45:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517856300; cv=none; d=google.com; s=arc-20160816; b=IU136P+QwgRdAD4FtVibS0QpS3PfFIiG9d+bcsdKwAX5KaeVqH9Dl6ClgoROSttCgb A3XD4H+Qk4Oqzyft3txEb1vXGGJUqyiOqR7OmhE8espQ8hF9AjwaxVjWT+y2ZdsxPVjJ F7Vbs/ZZKkFbsJUzkYDlEM0jh8leL6tzbTnEnxSLAfhJTr6TZCwvNpDsZdUwjnCM5WQ3 bWWgjXbvfYH7atoXImzy+5hSdwmTv6Vy0yP4CfI9bHTkD9/I6msRI7l9+Da/8d7cTWKb oMGSsOpKiVsrAZIOiwgkQdUdWoXIlfBaKFVMMzYIVpmvHBdydwF2eZ4mJg1J8PUCcqNh QIZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature :arc-authentication-results; bh=vpJqGuRBmLFZ8KE3Sh+OLlfm1PYktaX4P+HqkDrZREU=; b=064FBEKqfoyKEH9SfqBtvVCplGWJDmRmRB57MHfqU6aLvMNleAPtAhnfAAuO5pkV92 +51Ol2SiNHv7OMrg8S6pwufp8z4nVmWZCUjhjAiP83L64jmul95BQZYILut0mjrYelGt dNhIVV8i6Meh5dHFPAxtsP9lag9+hjyIrDYUpPAE5sujSw582SKgqxftexLJ/vwuX4VT lIJnVVfxGYA0jWV3nbbmOGig+N8nb+QMzqqVUnRAnujmxjp88hNZ59DDNqVprcATtFpL 7i280+/MSyz5A93aPiv6JRWXxP5mDFUEDgVtmkxP3vUFwd2c2q1g5brxR8eHPERmAWu4 /Ifg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=BuhTvwqR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y67si1076851pfy.216.2018.02.05.10.44.46; Mon, 05 Feb 2018 10:45:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=BuhTvwqR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753754AbeBESnQ (ORCPT + 99 others); Mon, 5 Feb 2018 13:43:16 -0500 Received: from mail-oi0-f68.google.com ([209.85.218.68]:40228 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753713AbeBESmn (ORCPT ); Mon, 5 Feb 2018 13:42:43 -0500 Received: by mail-oi0-f68.google.com with SMTP id 8so10685488oix.7; Mon, 05 Feb 2018 10:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=vpJqGuRBmLFZ8KE3Sh+OLlfm1PYktaX4P+HqkDrZREU=; b=BuhTvwqRCiEMqGTC1uqQJEIcouk0MGnSz1rIwf6vdiARsBL+uNbIuHdj1CwBvx9/Yn mFQv8bvsUfXl+cxufFnlXkxnkyOEN1ruZIjixEfIwedO8bHd+GU+saBzYnc5i/px6cr9 TPF7JbpO2EdSMIsGagjk50wkQeTZHs7gB5hnAqkmOa9RJpms1O3abitghsHIvu1B0nU0 Olq9XEZpZqf0nHLe5CZW2w2mu5uGb2GJzwU4bJHq28SFI70oXiI9ovYlwepIRgl4I9LQ 55+i/bESd5hYXHGmPVxgeRcWh06O3P09hp1LICgL7pXrzN7dCisv+btRea7JBJz+LUM5 nSzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=vpJqGuRBmLFZ8KE3Sh+OLlfm1PYktaX4P+HqkDrZREU=; b=qQ2M+BlTErvYX5xQ3czTq2BN0ifw43+/3H51QB82ME+BQ4/yRRTMpthrEeC+r+mOi/ EGvO3Lh0jkBv6w7SwLEGSGlVMdjGSV8RShZqzQcFavDTRKqHVGhk2raUfpSv35ni8i42 zpBf8C8SCSnh8Gjd1MAnUpchE7B/cCYkULJcI41IIm3/bZGgh6Lw3G0v0lsUssO+7Bgc PL/70ciCaGJM+3lw1OySPg2AG/xMmQKe7KYwkh8xXR2E5N4Ju3ARCjsQaTtwrRWiHH0m DLKZHbl+rRgQgd9jvHrawPMxx7S0R7NKZckbSn+qZwfYV4KieFdf7XWWhk7Y/LZ6qOHU ySPA== X-Gm-Message-State: AKwxytdQobJrw6Fo0+Fe9FvKieY/d7gemv+0uxgBwOv8SwuhfYqzEy6Q +xtO0jjAanxXyy3QvY5H374= X-Received: by 10.202.188.68 with SMTP id m65mr12731407oif.102.1517856162505; Mon, 05 Feb 2018 10:42:42 -0800 (PST) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id c34sm1074642otd.16.2018.02.05.10.42.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 10:42:41 -0800 (PST) Date: Mon, 5 Feb 2018 10:42:40 -0800 From: Guenter Roeck To: Linus Torvalds Cc: Wim Van Sebroeck , Andrew Morton , LKML , Linux Watchdog Mailing List , Andreas =?iso-8859-1?Q?F=E4rber?= , =?iso-8859-1?Q?Andr=E9?= Draszik , Andrew Jeffery , Arnd Bergmann , Benjamin Gaignard , Chris Packham , Christophe Leroy , Corentin Labbe , Corentin Labbe , David Lechner , Eric Long , Geert Uytterhoeven , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Jerry Hoemann , Linus Walleij , Martin Kaiser , Mathieu Malaterre , Matt Redfearn , Michael Grzeschik , Michael Grzeschik , Oleksij Rempel , Radu Rendec , Rasmus Villemoes , Tomas Winkler , Wim Van Sebroeck Subject: Re: [GIT PULL REQUEST] watchdog - v4.16 merge window Message-ID: <20180205184240.GA5116@roeck-us.net> References: <20180205102056.GA470@infomag.iguana.be> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 05, 2018 at 09:50:54AM -0800, Linus Torvalds wrote: > On Mon, Feb 5, 2018 at 2:20 AM, Wim Van Sebroeck wrote: > > > > git://www.linux-watchdog.org/linux-watchdog.git > > Hmm. I really want to know why I should pull this. You have the > shortlog and the diffstat, but you don't actually have a descriptive > blurb about _what_ I'm pulling. > > Please give me a summary of what this contains so that I can have a > good merge message. How about the following ? It matches Wim's tree, which I pulled and compared against my own copy. Only difference is the signed tag with a brief summary on top. Thanks, Guenter --- Subject: [GIT PULL] watchdog updates for v4.16 Hi Linus, Please pull watchdog updates for Linux v4.16 from signed tag: git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-for-linus-v4.16 Thanks, Guenter ------ The following changes since commit f3b5ad89de16f5d42e8ad36fbdf85f705c1ae051: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (2017-12-16 13:43:08 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git tags/watchdog-for-linus-v4.16 for you to fetch changes up to 592a547adf686dbec7687e816ecdf9101fe227f5: documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt (2018-02-03 11:09:54 +0100) ---------------------------------------------------------------- watchdog updates for v4.16 commit window - Converted to use watchdog subsystem: sp5100_tco, i6300esb, xen_wdt - New drivers: Spreadtrum, Realtek RTD1295 - Added r8a77970 support to renesas-wdt - Added jz4780 support to jz4740 - Removed at32ap700x_wdt driver - Removed obsolete documentation - Various bug fixes in watchdog core - Cleanup and bug fixes in several drivers - Added Guenter Roeck as co-maintainer ---------------------------------------------------------------- Andreas F?rber (2): dt-bindings: watchdog: Add Realtek RTD1295 watchdog: Add Realtek RTD1295 Andrew Jeffery (4): watchdog: aspeed: Retain watchdog enabled state watchdog: aspeed: Fix 'Apseed' typo in Kconfig watchdog: aspeed: Remove specific reference to AST2400 in Kconfig watchdog: aspeed: Move init to arch_initcall Andr? Draszik (2): watchdog: mt7621: set WDOG_HW_RUNNING bit when appropriate watchdog: mt7621: switch to using managed devm_watchdog_register_device() Arnd Bergmann (2): watchdog: xen: use time64_t for timeouts watchdog: hpwdt: fix unused variable warning Benjamin Gaignard (1): watchdog: stm32: Fix copyright Chris Packham (1): watchdog: orion: fix typo Christophe Leroy (3): watchdog: mpc8xxx: use the core worker function watchdog: core: make sure the watchdog worker always works watchdog: core: make sure the watchdog_worker is not deferred Corentin Labbe (6): watchdog: sunxi_wdt: use of_device_get_match_data watchdog: document watchdog_init_timeout() wdd parameter watchdog: remove at32ap700x_wdt documentation: watchdog: remove documentation of at32ap700x_wdt documentation: watchdog: remove documentation for ixp2000 documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt David Lechner (1): watchdog: davinci_wdt: add restart function Eric Long (2): dt-bindings: watchdog: Add Spreadtrum watchdog documentation watchdog: Add Spreadtrum watchdog driver Geert Uytterhoeven (1): dt-bindings: watchdog: renesas-wdt: Add support for the r8a77970 wdt Greg Kroah-Hartman (1): watchdog: pcwd_usb: remove unneeded DRIVER_LICENSE #define Guenter Roeck (15): watchdog: Fix potential kref imbalance when opening watchdog watchdog: Fix kref imbalance seen if handle_boot_enabled=0 MAINTAINERS: Add Guenter Roeck as co-maintainer of watchdog subsystem watchdog: sp5100_tco: Always use SP5100_IO_PM_{INDEX_REG,DATA_REG} watchdog: sp5100_tco: Fix watchdog disable bit watchdog: sp5100_tco: Use request_muxed_region where possible watchdog: sp5100_tco: Use standard error codes watchdog: sp5100_tco: Clean up sp5100_tco_setupdevice watchdog: sp5100_tco: Match PCI device early watchdog: sp5100_tco: Use dev_ print functions where possible watchdog: sp5100_tco: Clean up function and variable names watchdog: sp5100_tco: Convert to use watchdog subsystem watchdog: sp5100_tco: Use bit operations watchdog: sp5100-tco: Abort if watchdog is disabled by hardware watchdog: sp5100_tco: Add support for recent FCH versions Gustavo A. R. Silva (9): watchdog: advantechwdt: mark expected switch fall-through watchdog: alim1535_wdt: mark expected switch fall-through watchdog: f71808e_wdt: mark expected switch fall-throughs watchdog: pcwd_usb: mark expected switch fall-through watchdog: pcwd_pci: mark expected switch fall-through watchdog: watchdog_dev: mark expected switch fall-through watchdog: wdt_pci: mark expected switch fall-through watchdog: eurotechwdt: mark expected switch fall-through watchdog: ib700wdt: mark expected switch fall-through Jerry Hoemann (2): watchdog: hpwdt: SMBIOS check watchdog: hpwdt: Check source of NMI Linus Walleij (5): watchdog: gpio: Add some local helper variables watchdog: gpio: Convert to use GPIO descriptors watchdog: gemini/ftwdt010: rename DT bindings watchdog: gemini/ftwdt010: rename driver and symbols watchdog: ftwdt010: Make interrupt optional Martin Kaiser (1): watchdog: imx2_wdt: restore previous timeout after suspend+resume Mathieu Malaterre (2): watchdog: jz4740: Add support for the watchdog in jz4780 SoC dt: watchdog: Document compatibility with JZ4780 Matt Redfearn (1): watchdog: indydog: Add dependency on SGI_HAS_INDYDOG Michael Grzeschik (3): watchdog: da9062: Add restart handler support watchdog: da9062: Disable and wait before changing timeout watchdog: da9062: use protection delay mechanism from core Oleksij Rempel (1): watchdog: dw_wdt: add stop watchdog operation Radu Rendec (6): watchdog: i6300esb: use the watchdog subsystem watchdog: i6300esb: support multiple devices watchdog: i6300esb: do not hardcode heartbeat limits watchdog: i6300esb: remove info message and version number watchdog: xen_wdt: use the watchdog subsystem watchdog: xen_wdt: remove info message and version number Rasmus Villemoes (1): watchdog: gpio_wdt: set WDOG_HW_RUNNING in gpio_wdt_stop Tomas Winkler (1): watchdog: mei_wdt: don't use of variable length array Wim Van Sebroeck (1): Change my E-mail address. .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 - ...ina,gemin-watchdog.txt => faraday,ftwdt010.txt} | 11 +- .../bindings/watchdog/ingenic,jz4740-wdt.txt | 4 +- .../bindings/watchdog/realtek,rtd119x.txt | 17 + .../devicetree/bindings/watchdog/renesas-wdt.txt | 3 +- .../devicetree/bindings/watchdog/sprd-wdt.txt | 19 + Documentation/watchdog/watchdog-parameters.txt | 23 - MAINTAINERS | 4 +- drivers/watchdog/Kconfig | 41 +- drivers/watchdog/Makefile | 7 +- drivers/watchdog/advantechwdt.c | 2 +- drivers/watchdog/alim1535_wdt.c | 2 +- drivers/watchdog/aspeed_wdt.c | 21 +- drivers/watchdog/at32ap700x_wdt.c | 433 ------------- drivers/watchdog/da9062_wdt.c | 48 +- drivers/watchdog/davinci_wdt.c | 38 ++ drivers/watchdog/dw_wdt.c | 18 +- drivers/watchdog/eurotechwdt.c | 2 +- drivers/watchdog/f71808e_wdt.c | 4 +- drivers/watchdog/ftwdt010_wdt.c | 236 +++++++ drivers/watchdog/gemini_wdt.c | 229 ------- drivers/watchdog/gpio_wdt.c | 58 +- drivers/watchdog/hpwdt.c | 12 +- drivers/watchdog/i6300esb.c | 377 ++++------- drivers/watchdog/ib700wdt.c | 2 +- drivers/watchdog/imx2_wdt.c | 20 +- drivers/watchdog/jz4740_wdt.c | 1 + drivers/watchdog/mei_wdt.c | 7 +- drivers/watchdog/mpc8xxx_wdt.c | 83 ++- drivers/watchdog/mt7621_wdt.c | 34 +- drivers/watchdog/orion_wdt.c | 2 +- drivers/watchdog/pcwd_pci.c | 2 +- drivers/watchdog/pcwd_usb.c | 5 +- drivers/watchdog/rtd119x_wdt.c | 168 +++++ drivers/watchdog/sp5100_tco.c | 710 +++++++++------------ drivers/watchdog/sp5100_tco.h | 57 +- drivers/watchdog/sprd_wdt.c | 399 ++++++++++++ drivers/watchdog/stm32_iwdg.c | 6 +- drivers/watchdog/sunxi_wdt.c | 7 +- drivers/watchdog/watchdog_core.c | 1 + drivers/watchdog/watchdog_dev.c | 125 ++-- drivers/watchdog/wdt_pci.c | 2 +- drivers/watchdog/xen_wdt.c | 255 ++------ 43 files changed, 1711 insertions(+), 1801 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt rename Documentation/devicetree/bindings/watchdog/{cortina,gemin-watchdog.txt => faraday,ftwdt010.txt} (55%) create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt create mode 100644 Documentation/devicetree/bindings/watchdog/sprd-wdt.txt delete mode 100644 drivers/watchdog/at32ap700x_wdt.c create mode 100644 drivers/watchdog/ftwdt010_wdt.c delete mode 100644 drivers/watchdog/gemini_wdt.c create mode 100644 drivers/watchdog/rtd119x_wdt.c create mode 100644 drivers/watchdog/sprd_wdt.c