linux-kernel - linux-next: manual merge of the trivial tree with the pm 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:	Wed, 23 Jan 2013 14:09:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masanari Iida <standby24x7@...il.com>,
	Nishanth Menon <nm@...com>, "Rafael J. Wysocki" <rjw@...k.pl>
Subject: linux-next: manual merge of the trivial tree with the pm tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/devfreq/exynos4_bus.c between commit 8fa938acb318 ("PM / devfreq:
exynos4_bus: honor RCU lock usage") from the pm tree and commit
8a168ca7074b ("treewide: Fix typo in various drivers") from the trivial
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/devfreq/exynos4_bus.c
index 46d94e9,e1ac076..0000000
--- a/drivers/devfreq/exynos4_bus.c
+++ b/drivers/devfreq/exynos4_bus.c
@@@ -658,7 -636,7 +658,7 @@@ static int exynos4_bus_target(struct de
  	if (old_freq == freq)
  		return 0;
  
- 	dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt);
 -	dev_dbg(dev, "targeting %lukHz %luuV\n", freq, opp_get_voltage(opp));
++	dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt);
  
  	mutex_lock(&data->lock);
  

Content of type "application/pgp-signature" skipped