Subject: RE: linux-next: manual merge of the s5p tree with the arm tree

From: Kukjin Kim <[email-masked]>
Date: Wed, 20 Jul 2011 19:38:55 +0900

Stephen Rothwell wrote:
> Hi Russell,
Hi Russell and Stephen,

> On Wed, 20 Jul 2011 09:04:41 +0100 Russell King <[email-masked]>
wrote:
> >
> > On Wed, Jul 20, 2011 at 11:35:58AM +1000, Stephen Rothwell wrote:
> > > BTW, Russell, commit 29cb3cd208dd above changed the return type of
> > > exynos4_cpu_suspend() from void to int but did not add any return
> > > statement ...
> >
> > That's fine - it ends with a call to panic() which is declared as a
> > function which never returns.  Therefore, exynos4_cpu_suspend() itself
> > never returns.
> 
> Ah, yes.  Unfortunately, the s5p tree changes removed the panic.  So, I
> guess the merge needs some other fixup.
> 
Oops, yes. I fixed it and thanks a lot for pointing out.

Best regards,
Kgene.
--
Kukjin Kim <[email-masked]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.