diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-28 09:55:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-28 09:55:25 -0700 |
| commit | eecd231a80a5d54afc5eb350fc890ab15350408d (patch) | |
| tree | 2a2ddc56fd2ee6e042505fcdf4dd27c15cf94a93 /crypto/aead.c | |
| parent | fc18cc89b9802dbe710cbfb52d0b11b3197ead18 (diff) | |
| parent | cd004d8299f1dc6cfa6a4eea8f94cb45eaedf070 (diff) | |
Merge tag 'linux-watchdog-5.15-rc7' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"I overlooked Guenters request to sent this upstream earlier, so it's a
bit late in the release cycle.
This contains:
- Revert "watchdog: iTCO_wdt: Account for rebooting on second
timeout"
- sbsa: only use 32-bit accessors
- sbsa: drop unneeded MODULE_ALIAS
- ixp4xx_wdt: Fix address space warning
- Fix OMAP watchdog early handling"
* tag 'linux-watchdog-5.15-rc7' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: Fix OMAP watchdog early handling
watchdog: ixp4xx_wdt: Fix address space warning
watchdog: sbsa: drop unneeded MODULE_ALIAS
watchdog: sbsa: only use 32-bit accessors
Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout"
Diffstat (limited to 'crypto/aead.c')
0 files changed, 0 insertions, 0 deletions