aboutsummaryrefslogtreecommitdiff
path: root/Documentation/maintainer/rebasing-and-merging.rst
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2024-05-20 09:07:27 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2024-05-20 09:07:27 -0700
commita913d94eef59f6d1d907c3214f12827144bab6a5 (patch)
treec47480737df78cf8074f3d6c045f36ecb032b5e7 /Documentation/maintainer/rebasing-and-merging.rst
parentMerge tag 'i2c-for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentwatchdog: LENOVO_SE10_WDT should depend on X86 && DMI (diff)
downloadlinux-a913d94eef59f6d1d907c3214f12827144bab6a5.tar.gz
linux-a913d94eef59f6d1d907c3214f12827144bab6a5.tar.bz2
linux-a913d94eef59f6d1d907c3214f12827144bab6a5.zip
Merge tag 'linux-watchdog-6.10-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - Add Lenovo SE10 platform Watchdog Driver - Other small fixes and improvements * tag 'linux-watchdog-6.10-rc1' of git://www.linux-watchdog.org/linux-watchdog: watchdog: LENOVO_SE10_WDT should depend on X86 && DMI watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe() watchdog: rti_wdt: Set min_hw_heartbeat_ms to accommodate a safety margin watchdog: add HAS_IOPORT dependencies watchdog/wdt-main: Use cpumask_of() to avoid cpumask var on stack watchdog: bd9576: Drop "always-running" property watchdog: mtx-1: drop driver owner assignment watchdog: cpu5wdt.c: Fix use-after-free bug caused by cpu5wdt_trigger watchdog: lenovo_se10_wdt: Watchdog driver for Lenovo SE10 platform
Diffstat (limited to 'Documentation/maintainer/rebasing-and-merging.rst')
0 files changed, 0 insertions, 0 deletions