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,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Jamie Iles <jamie@jamieiles.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the s5p tree with the arm tree
Date: Mon, 5 Dec 2011 11:01:41 +1100 [thread overview]
Message-ID: <20111205110141.90c553323cf5d29fd2c3eeae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 887 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c64xx/mach-crag6410.c between commit 774b51f8f826 ("ARM:
s3c64xx: convert to MULTI_IRQ_HANDLER") from the arm tree and commit
8504a3cb5cbc ("ARM: S3C64XX: Configure WM1250 EV1 GPIOs on Cragganmore")
from the s5p tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 988ac2e,b2381c1..0000000
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -37,7 -37,8 +37,9 @@@
#include <linux/mfd/wm831x/irq.h>
#include <linux/mfd/wm831x/gpio.h>
+ #include <sound/wm1250-ev1.h>
+
+#include <asm/hardware/vic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-12-05 0:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-05 0:01 Stephen Rothwell [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-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-07-20 1:35 Stephen Rothwell
2011-07-20 8:04 ` Russell King
2011-07-20 8:25 ` Stephen Rothwell
2011-07-20 10:38 ` Kukjin Kim
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=20111205110141.90c553323cf5d29fd2c3eeae@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=jamie@jamieiles.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/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
all inboxes | Powered by JetHome®