Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/clksrc-of.c between commit 4c4b053235fa
("clocksource: clksrc-of: Do not drop unheld reference on device node")
from Linus' tree and commit fdca679d87bb ("clocksource: clksrc-of: Warn
if no clock sources are found") from the clockevents tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc drivers/clocksource/clksrc-of.c index b9ddd9e3a2f5,a30b42c3ac3b..000000000000 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@@ -35,5 -36,9 +36,8 @@@ void __init clocksource_of_init(void init_func = match->data; init_func(np); - of_node_put(np); + clocksources++; } + if (!clocksources) + pr_crit("%s: no matching clocksources found\n", __func__); }
pgpp_r1TT_8Kw.pgp
Description: PGP signature
