* linux-next: manual merge of the s5p tree with Linus' tree
@ 2010-07-13 0:54 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-07-13 0:54 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/configs/s5pc110_defconfig between commit
07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
Linus' tree and commit 2976beb1dd86974ae98a992ca23a626f8be7e7dd ("ARM:
s5pv210_defconfig: Update for removing s5pc110_defconfig") from the s5p
tree.
The latter just removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the s5p tree with Linus' tree
@ 2012-03-07 0:29 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-03-07 0:29 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, Heiko Stuebner
[-- 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 --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: linux-next: manual merge of the s5p tree with Linus' tree
2012-01-24 2:21 Stephen Rothwell
@ 2012-01-24 12:27 ` Kukjin Kim
0 siblings, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2012-01-24 12:27 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'MyungJoo Ham',
'Kyungmin Park'
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi Stephen,
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-exynos/cpu.c between commit cc511b8d84d8 ("ARM: 7257/1:
> EXYNOS: introduce arch/arm/mach-exynos/common.[ch]") from Linus' tree and
> commit 566fcbb817fb ("ARM: EXYNOS: Add DMC1 and allow PPMU access for
> DMC") from the s5p tree.
>
> The former removes this file, so the latter patch now needs to be applied
> to arch/arm/mach-exynos/common.c (I think).
>
Yes, right. Let me fix it. Thanks.
> Maybe the s5p tree should be rebased onto v3.3-rc1 (or merged with it)
> since there are other conflicts as well due to duplicated patches (same
> patch different commit).
Yes, let me rebase my tree onto v3.3-rc1 and then will merge other branches for v3.4 ;)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the s5p tree with Linus' tree
@ 2012-01-24 2:21 Stephen Rothwell
2012-01-24 12:27 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-01-24 2:21 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, MyungJoo Ham, Kyungmin Park
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos/cpu.c between commit cc511b8d84d8 ("ARM: 7257/1:
EXYNOS: introduce arch/arm/mach-exynos/common.[ch]") from Linus' tree and
commit 566fcbb817fb ("ARM: EXYNOS: Add DMC1 and allow PPMU access for
DMC") from the s5p tree.
The former removes this file, so the latter patch now needs to be applied
to arch/arm/mach-exynos/common.c (I think).
Maybe the s5p tree should be rebased onto v3.3-rc1 (or merged with it)
since there are other conflicts as well due to duplicated patches (same
patch different commit).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: linux-next: manual merge of the s5p tree with Linus' tree
2010-07-13 1:14 Stephen Rothwell
@ 2010-07-13 2:29 ` Kukjin Kim
0 siblings, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2010-07-13 2:29 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Uwe Kleine-König'
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi :-)
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/configs/s5pv210_defconfig between commit
> 07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
> Linus' tree and commit 2976beb1dd86974ae98a992ca23a626f8be7e7dd ("ARM:
> s5pv210_defconfig: Update for removing s5pc110_defconfig") from the s5p
> tree.
>
> I fixed it up (see below - it may no longer be minimal) and can carry the
> fix as necessary.
Thanks..and I will fix it in my tree.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --git a/arch/arm/configs/s5pv210_defconfig
> b/arch/arm/configs/s5pv210_defconfig
> index 1753836..bbb1736 100644
> --- a/arch/arm/configs/s5pv210_defconfig
> +++ b/arch/arm/configs/s5pv210_defconfig
> @@ -7,6 +7,10 @@ CONFIG_MODULE_UNLOAD=y
> # CONFIG_BLK_DEV_BSG is not set
> CONFIG_ARCH_S5PV210=y
> CONFIG_S3C_LOWLEVEL_UART_PORT=1
> +CONFIG_S3C_DEV_FB=y
> +CONFIG_S5PV210_SETUP_FB_24BPP=y
> +CONFIG_MACH_AQUILA=y
> +CONFIG_MACH_SMDKC110=y
> CONFIG_MACH_SMDKV210=y
> CONFIG_VMSPLIT_2G=y
> CONFIG_PREEMPT=y
> @@ -31,6 +35,9 @@ CONFIG_SERIAL_SAMSUNG=y
> CONFIG_SERIAL_SAMSUNG_CONSOLE=y
> CONFIG_HW_RANDOM=y
> # CONFIG_HWMON is not set
> +# CONFIG_RAMOOPS is not set
> +CONFIG_MFD_SUPPORT=y
> +# CONFIG_ABX500_CORE is not set
> # CONFIG_VGA_CONSOLE is not set
> # CONFIG_HID_SUPPORT is not set
> # CONFIG_USB_SUPPORT is not set
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the s5p tree with Linus' tree
@ 2010-07-13 1:14 Stephen Rothwell
2010-07-13 2:29 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-07-13 1:14 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, Uwe Kleine-König
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/configs/s5pv210_defconfig between commit
07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
Linus' tree and commit 2976beb1dd86974ae98a992ca23a626f8be7e7dd ("ARM:
s5pv210_defconfig: Update for removing s5pc110_defconfig") from the s5p
tree.
I fixed it up (see below - it may no longer be minimal) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_defconfig
index 1753836..bbb1736 100644
--- a/arch/arm/configs/s5pv210_defconfig
+++ b/arch/arm/configs/s5pv210_defconfig
@@ -7,6 +7,10 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_S5PV210=y
CONFIG_S3C_LOWLEVEL_UART_PORT=1
+CONFIG_S3C_DEV_FB=y
+CONFIG_S5PV210_SETUP_FB_24BPP=y
+CONFIG_MACH_AQUILA=y
+CONFIG_MACH_SMDKC110=y
CONFIG_MACH_SMDKV210=y
CONFIG_VMSPLIT_2G=y
CONFIG_PREEMPT=y
@@ -31,6 +35,9 @@ CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_HW_RANDOM=y
# CONFIG_HWMON is not set
+# CONFIG_RAMOOPS is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_ABX500_CORE is not set
# CONFIG_VGA_CONSOLE is not set
# CONFIG_HID_SUPPORT is not set
# CONFIG_USB_SUPPORT is not set
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-07 0:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-13 0:54 linux-next: manual merge of the s5p tree with Linus' tree Stephen Rothwell
2010-07-13 1:14 Stephen Rothwell
2010-07-13 2:29 ` Kukjin Kim
2012-01-24 2:21 Stephen Rothwell
2012-01-24 12:27 ` Kukjin Kim
2012-03-07 0:29 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).