| 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
| ||
|
Message-id: <00e901cbdf9e$f0842510$d18c6f30$%kim@samsung.com>
Date: Fri, 11 Mar 2011 12:46:30 +0900
From: Kukjin Kim <kgene.kim@...sung.com>
To: 'Dave Jones' <davej@...hat.com>,
'Stephen Rothwell' <sfr@....ibm.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
"'Rafael J. Wysocki'" <rjw@...k.pl>
Subject: RE: linux-next: manual merge of the cpufreq tree with the s5p tree
Dave Jones wrote:
>
> On Fri, Mar 11, 2011 at 01:35:42PM +1100, Stephen Rothwell wrote:
> > 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.
>
> Yep, Looks fine to me. thanks.
>
> Dave
Of course, it's ok to me too.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@...sung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
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/
Powered by blists - more mailing lists