| Message ID | 20210907191139.GA18865@www.linux-watchdog.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [GIT,PULL,REQUEST] watchdog - v5.12 Merge window | expand |
Hi Linus, My Apologies. The subject of this e-mail is wrong again. It should have been [GIT PULL REQUEST] watchdog - v5.15 Merge window Sorry, Wim.
On Tue, Sep 7, 2021 at 1:46 PM Wim Van Sebroeck <wim@linux-watchdog.org> wrote: > > My Apologies. The subject of this e-mail is wrong again. It should have been [GIT PULL REQUEST] watchdog - v5.15 Merge window Heh. That was fairly obvious. No problem. My email search terms end up being just "git" and "pull", so it's not like I end up even really looking at the version numbers except closer to the end of the release. At that point people start sending me early pull requests for the next merge window, and I start looking more closely just to make sure I differentiate between "fixes for this release" and "updates for the next merge window". ... and even then, it's usually pretty obvious from the actual contents, and if somebody gets a version number wrong it generally isn't all that confusing. Linus
The pull request you sent on Tue, 7 Sep 2021 21:11:39 +0200:
> git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.15-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4c00e1e2e58eefb288ba9ef585b6f19e1f33bf1e
Thank you!
Hi Linus, Please pull the watchdog changes for the v5.12 release cycle. This series contains: * Add Mediatek MT7986 & MT8195 wdt support * Add Maxim MAX63xx * Drop bd70528 support * rewrite ixp4xx to watchdog framework * Constify static struct watchdog_ops for sl28cpld_wdt, mpc8xxx_wdt and tqmx86 * Introduce watchdog_dev_suspend/resume * Several fixes and improvements The output from git request-pull: ---------------------------------------------------------------- The following changes since commit d992fe5318d8d7af9510b879439a3c7f283da442: Merge tag 'soc-fixes-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (2021-08-19 15:32:58 -0700) are available in the git repository at: git://www.linux-watchdog.org/linux-watchdog.git tags/linux-watchdog-5.15-rc1 for you to fetch changes up to 41e73feb1024929e75eaf2f7cd93f35a3feb331b: dt-bindings: watchdog: Add compatible for Mediatek MT7986 (2021-08-22 10:28:12 +0200) ---------------------------------------------------------------- linux-watchdog 5.15-rc1 tag ---------------------------------------------------------------- Christine Zhu (2): dt-bindings: reset: mt8195: add toprgu reset-controller header file watchdog: mediatek: mt8195: add wdt support Curtis Klein (2): watchdog: only run driver set_pretimeout op if device supports it watchdog: Fix NULL pointer dereference when releasing cdev Grzegorz Jaszczyk (2): watchdog: introduce watchdog_dev_suspend/resume watchdog: imx2_wdg: notify wdog core to stop ping worker on suspend Jan Kiszka (2): watchdog: iTCO_wdt: Fix detection of SMI-off case watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate Linus Walleij (3): dt-bindings: watchdog: Add Maxim MAX63xx bindings watchdog: max63xx_wdt: Add device tree probing watchdog: ixp4xx: Rewrite driver to use core Matti Vaittinen (1): watchdog: bd70528 drop bd70528 support Rikard Falkeborn (3): watchdog: sl28cpld_wdt: Constify static struct watchdog_ops watchdog: mpc8xxx_wdt: Constify static struct watchdog_ops watchdog: tqmx86: Constify static struct watchdog_ops Sam Shih (1): dt-bindings: watchdog: Add compatible for Mediatek MT7986 Stefan Wahren (1): watchdog: bcm2835_wdt: consider system-power-controller property .../bindings/watchdog/maxim,max63xx.yaml | 44 ++++ .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 + drivers/clocksource/timer-ixp4xx.c | 48 +++- drivers/watchdog/Kconfig | 13 +- drivers/watchdog/Makefile | 1 - drivers/watchdog/bcm2835_wdt.c | 10 +- drivers/watchdog/bd70528_wdt.c | 291 --------------------- drivers/watchdog/iTCO_wdt.c | 2 +- drivers/watchdog/imx2_wdt.c | 1 + drivers/watchdog/ixp4xx_wdt.c | 283 +++++++++----------- drivers/watchdog/max63xx_wdt.c | 24 +- drivers/watchdog/mpc8xxx_wdt.c | 2 +- drivers/watchdog/mtk_wdt.c | 6 + drivers/watchdog/sl28cpld_wdt.c | 2 +- drivers/watchdog/tqmx86_wdt.c | 2 +- drivers/watchdog/watchdog_core.c | 37 +++ drivers/watchdog/watchdog_dev.c | 57 +++- include/dt-bindings/reset/mt8195-resets.h | 29 ++ include/linux/watchdog.h | 10 + 19 files changed, 368 insertions(+), 495 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml delete mode 100644 drivers/watchdog/bd70528_wdt.c create mode 100644 include/dt-bindings/reset/mt8195-resets.h ---------------------------------------------------------------- Kind regards, Wim.