From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 May 2017 15:35:27 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v5.15~11257
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec53c027f3e6b0ee82a5d18de7b0d8bfae3ec374;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 - orion_wdt compile-test dependencies
 - sama5d4_wdt: WDDIS handling and a race confition
 - pcwd_usb: fix NULL-deref at probe
 - cadence_wdt: fix timeout setting
 - wdt_pci: fix build error if SOFTWARE_REBOOT is defined
 - iTCO_wdt: all versions count down twice
 - zx2967: remove redundant dev_err call in zx2967_wdt_probe()
 - bcm281xx: Fix use of uninitialized spinlock

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: bcm281xx: Fix use of uninitialized spinlock.
  watchdog: zx2967: remove redundant dev_err call in zx2967_wdt_probe()
  iTCO_wdt: all versions count down twice
  watchdog: wdt_pci: fix build error if define SOFTWARE_REBOOT
  watchdog: cadence_wdt: fix timeout setting
  watchdog: pcwd_usb: fix NULL-deref at probe
  watchdog: sama5d4: fix race condition
  watchdog: sama5d4: fix WDDIS handling
  watchdog: orion: fix compile-test dependencies
---

ec53c027f3e6b0ee82a5d18de7b0d8bfae3ec374