From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
'Russell King' <rmk@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Jaecheol Lee' <jc.lee@samsung•com>
Subject: RE: linux-next: manual merge of the s5p tree with the arm tree
Date: Wed, 20 Jul 2011 19:38:55 +0900 [thread overview]
Message-ID: <064301cc46c9$622cdd60$26869820$%kim@samsung.com> (raw)
In-Reply-To: <20110720182540.c53726975c8a0b3a48d609b1@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Russell,
>
Hi Russell and Stephen,
> On Wed, 20 Jul 2011 09:04:41 +0100 Russell King <rmk@arm•linux.org.uk>
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@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2011-07-20 10:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-20 1:35 linux-next: manual merge of the s5p tree with the arm tree Stephen Rothwell
2011-07-20 8:04 ` Russell King
2011-07-20 8:25 ` Stephen Rothwell
2011-07-20 10:38 ` Kukjin Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-05 1:09 Stephen Rothwell
2012-01-05 2:34 ` Kukjin Kim
2012-01-04 2:18 Stephen Rothwell
2012-01-04 9:07 ` Russell King
2012-01-05 0:46 ` Kukjin Kim
2011-12-27 23:36 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-28 8:33 ` Kukjin Kim
2011-12-27 23:21 Stephen Rothwell
2011-12-27 23:17 Stephen Rothwell
2011-12-27 23:07 Stephen Rothwell
2011-12-28 8:01 ` Kukjin Kim
2011-12-05 0:01 Stephen Rothwell
2011-11-22 2:05 Stephen Rothwell
2011-11-22 2:01 Stephen Rothwell
2011-10-11 2:07 Stephen Rothwell
2011-09-22 2:08 Stephen Rothwell
2011-05-23 1:58 Stephen Rothwell
2010-10-17 23:55 Stephen Rothwell
2010-10-18 1:04 ` Kukjin Kim
2010-10-17 23:50 Stephen Rothwell
2010-10-18 0:57 ` Kukjin Kim
2010-10-18 10:39 ` Kukjin Kim
2010-07-30 0:48 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='064301cc46c9$622cdd60$26869820$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=jc.lee@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox