diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 15:43:50 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 15:43:50 -0700 | 
| commit | 41531f58a6513b86f8f379117eca82502022b4a9 (patch) | |
| tree | 18d69ef03890d23e6b7d379467ea6cf07f377bfe /net/tipc/bcast.h | |
| parent | 80a17a5f501ea048d86f81d629c94062b76610d4 (diff) | |
| parent | 1991a55dc87e8f2557bc90d7f0062b7110ab8437 (diff) | |
Merge tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
 - Add Nuvoton NPCM watchdog driver
 - renesas_wdt: Add R-Car Gen2 support
 - renesas_wdt: add suspend/resume and restart handler support
 - hpwdt: convert to watchdog core and improve NMI
 - improve timeout setting/handling in various drivers
 - coh901327: make license text and module licence match
 - fix error handling in asm9260_wdt, sprd_wdt and davinci_wdt
 - aspeed imrovements
 - dw improvements (for control register & suspend/resume)
 - add SPDX identifiers for watchdog subsystem
* tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog: (35 commits)
  watchdog: davinci_wdt: fix error handling in davinci_wdt_probe()
  watchdog: add SPDX identifiers for watchdog subsystem
  watchdog: aspeed: Allow configuring for alternate boot
  watchdog: Add Nuvoton NPCM watchdog driver
  dt-bindings: watchdog: Add Nuvoton NPCM description
  watchdog: dw: save/restore control and timeout across suspend/resume
  watchdog: dw: RMW the control register
  watchdog: sprd_wdt: Fix error handling in sprd_wdt_enable()
  watchdog: aspeed: Fix translation of reset mode to ctrl register
  watchdog: renesas_wdt: Add restart handler
  watchdog: renesas_wdt: Add R-Car Gen2 support
  watchdog: renesas_wdt: Add suspend/resume support
  watchdog: f71808e_wdt: Fix WD_EN register read
  watchdog: hpwdt: Update driver version.
  watchdog: hpwdt: Add dynamic debug
  watchdog: hpwdt: Programable Pretimeout NMI
  watchdog: hpwdt: remove allow_kdump module parameter.
  watchdog: hpwdt: condition early return of NMI handler on iLO5
  watchdog: hpwdt: Modify to use watchdog core.
  watchdog: hpwdt: Update nmi_panic message.
  ...
Diffstat (limited to 'net/tipc/bcast.h')
0 files changed, 0 insertions, 0 deletions
