linux-kernel - linux-next: manual merge of the cpufreq tree with the s5p 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>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 11 Mar 2011 13:35:42 +1100
From:	Stephen Rothwell <sfr@....ibm.com>
To:	Dave Jones <davej@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the cpufreq tree with the s5p tree

Hi Dave,

Today's linux-next merge of the cpufreq tree got a conflict in
arch/arm/mach-exynos4/cpufreq.c between commit 7d30e8b3815f ("ARM:
EXYNOS4: Add EXYNOS4 CPU initialization support") from the s5p tree and
commit 44033b9c940e ([CPUFREQ] Remove the pm_message_t argument from
driver suspend"") from the cpufreq tree (where this file is called
arch/arm/mach-s5pv310/cpufreq.c).

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-exynos4/cpufreq.c
index a16ac35,7c08ad7..0000000
--- a/arch/arm/mach-exynos4/cpufreq.c
+++ b/arch/arm/mach-exynos4/cpufreq.c
@@@ -452,8 -458,7 +452,7 @@@ static int exynos4_target(struct cpufre
  }
  
  #ifdef CONFIG_PM
- static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy,
- 				   pm_message_t pmsg)
 -static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy)
++static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy)
  {
  	return 0;
  }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/