* linux-next: manual merge of the akpm tree with the samsung tree
@ 2013-06-25 8:16 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-06-25 8:16 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Tomasz Figa, Kyungmin Park, Kukjin Kim,
Robin Holt
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm/mach-s3c64xx/common.c between commit cae36a5ce9c9 ("ARM:
SAMSUNG: Set PWM platform data") from the samsung tree and commit
"reboot: arm: change reboot_mode to use enum reboot_mode" from the akpm
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s3c64xx/common.c
index 0b33683,54f4a05..0000000
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@@ -26,7 -26,7 +26,8 @@@
#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/irqchip/arm-vic.h>
+ #include <linux/reboot.h>
+#include <clocksource/samsung_pwm.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-06-25 8:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-25 8:16 linux-next: manual merge of the akpm tree with the samsung tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).