Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in:
drivers/watchdog/mpc8xxx_wdt.c
between commit:
e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")
from Linus' tree and commit:
fbdec655375c ("watchdog: mpc8xxx: use the core worker function")
from the
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in:
drivers/watchdog/mpc8xxx_wdt.c
between commit:
e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")
from Linus' tree and commit:
fbdec655375c ("watchdog: mpc8xxx: use the core worker function")
from the
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in
drivers/rtc/rtc-stmp3xxx.c between commit c8a6046e1e0b ("drivers/rtc: use
of_match_ptr() macro") from Linus' tree and commit e02f5cf6b648 ("rtc:
stmp3xxx: add wdt-accessor function") from the watchdog tree.
I fixed it up
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in
drivers/rtc/rtc-stmp3xxx.c between commit c8a6046e1e0b (drivers/rtc: use
of_match_ptr() macro) from Linus' tree and commit e02f5cf6b648 (rtc:
stmp3xxx: add wdt-accessor function) from the watchdog tree.
I fixed it up (see
4 matches
Mail list logo