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

[Kukjin Kim]

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

> On Wed, 20 Jul 2011 09:04:41 +0100 Russell King <rmk@xxxxxxxxxxxxxxxx>
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 <kgene.kim@xxxxxxxxxxx>, 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/