linux-kernel - linux-next: manual merge of the clockevents tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 20 Dec 2013 15:09:21 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...il.com>,
	Linus Walleij <linus.walleij@...aro.org>
Subject: linux-next: manual merge of the clockevents tree with Linus' tree

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                    sfr@...b.auug.org.au

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__);
  }

Content of type "application/pgp-signature" skipped