From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Heiko Stuebner <heiko@sntech.de>
Subject: linux-next: manual merge of the s5p tree with Linus' tree
Date: Wed, 7 Mar 2012 11:29:26 +1100 [thread overview]
Message-ID: <20120307112926.84043e2f2db878026ebfd72a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c2440/common.h between commit c1ba544f8154 ("ARM:
S3C24XX: Fix restart on S3C2442") from Linus' tree and commit
dd6f01b5ccba ("ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/")
from the s5p tree.
The latter removed the file so I did that. I also added this fix up
patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Mar 2012 11:26:40 +1100
Subject: [PATCH] ARM: S3C24XX: fix for Fix restart on S3C2442
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mach-s3c24xx/common.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/common.h b/arch/arm/mach-s3c24xx/common.h
index 62a2e19..39f5394 100644
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@ -17,7 +17,7 @@ void s3c2410_restart(char mode, const char *cmd);
#endif
#ifdef CONFIG_CPU_S3C2440
-void s3c2440_restart(char mode, const char *cmd);
+void s3c244x_restart(char mode, const char *cmd);
#endif
#endif /* __ARCH_ARM_MACH_S3C2410_COMMON_H */
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-07 0:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 0:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-24 2:21 linux-next: manual merge of the s5p tree with Linus' tree Stephen Rothwell
2012-01-24 12:27 ` Kukjin Kim
2010-07-13 1:14 Stephen Rothwell
2010-07-13 2:29 ` Kukjin Kim
2010-07-13 0:54 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=20120307112926.84043e2f2db878026ebfd72a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=heiko@sntech.de \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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