* linux-next: manual merge of the s5p tree with the arm-current tree
@ 2010-09-10 1:10 Stephen Rothwell
2010-09-10 23:03 ` Kukjin Kim
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-09-10 1:10 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/Kconfig between commit 9e84ed63dc71e13b62cea5ec6b0049260cca0b7a
("ARM: Partially revert "Auto calculate ZRELADDR and provide option for
exceptions"") from the arm-current tree and commit
03c1ebb0c4e84c4de78f522a73fe1e813b9a1fc1 ("ARM: S5P64X0: Update Kconfig
and Makefile") from the s5p tree.
I used the arm-current version, but there may be some fix required for
the s5p tree.
--
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] 3+ messages in thread
* RE: linux-next: manual merge of the s5p tree with the arm-current tree
2010-09-10 1:10 linux-next: manual merge of the s5p tree with the arm-current tree Stephen Rothwell
@ 2010-09-10 23:03 ` Kukjin Kim
0 siblings, 0 replies; 3+ messages in thread
From: Kukjin Kim @ 2010-09-10 23:03 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Russell King'
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi :-)
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/Kconfig between commit 9e84ed63dc71e13b62cea5ec6b0049260cca0b7a
> ("ARM: Partially revert "Auto calculate ZRELADDR and provide option for
> exceptions"") from the arm-current tree and commit
> 03c1ebb0c4e84c4de78f522a73fe1e813b9a1fc1 ("ARM: S5P64X0: Update Kconfig
> and Makefile") from the s5p tree.
>
Oh, ok...thanks for your information.
> I used the arm-current version, but there may be some fix required for
> the s5p tree.
>
Sure, I fixed my tree for it.
Have a nice weekend ;-)
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] 3+ messages in thread
* linux-next: manual merge of the s5p tree with the arm-current tree
@ 2011-12-27 23:33 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-12-27 23:33 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Russell King, Javi Merino, Boojin Kim
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/common/pl330.c between commit abb959f8a3f1 ("ARM: 7237/1: PL330:
Fix driver freeze") from the arm-current tree and commit 5f3f34eb0ed2
("DMA: PL330: Merge PL330 driver into drivers/dma/") from the s5p tree.
The latter removed the file and merged it into drivers/dma/pl330.c.
There may be further fixups requires to that file. I just removed
arch/arm/common/pl330.c.
--
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] 3+ messages in thread
end of thread, other threads:[~2011-12-27 23:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-10 1:10 linux-next: manual merge of the s5p tree with the arm-current tree Stephen Rothwell
2010-09-10 23:03 ` Kukjin Kim
2011-12-27 23:33 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).