* linux-next: manual merge of the s5p tree with the arm-soc tree
@ 2011-07-20 1:35 Stephen Rothwell
2011-07-20 10:13 ` Ben Dooks
2011-07-20 10:30 ` Kukjin Kim
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-07-20 1:35 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Thomas Abraham, Nicolas Pitre,
Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got conflicts in drivers/tty/serial/s3c2400.c and drivers/tty/serial/s3c24a0.c between commits 632b7cf6c056 ("ARM: mach-s3c2400: delete") and af0e060e24ce ("ARM: mach-s3c24a0: delete")from the arm-soc tree and commit 470805f8f958 ("serial: Remove redundant console_initcall from s3c and s5p console drivers") from the s5p tree.
The former removes these files, 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] 3+ messages in thread
* Re: linux-next: manual merge of the s5p tree with the arm-soc tree
2011-07-20 1:35 linux-next: manual merge of the s5p tree with the arm-soc tree Stephen Rothwell
@ 2011-07-20 10:13 ` Ben Dooks
2011-07-20 10:30 ` Kukjin Kim
1 sibling, 0 replies; 3+ messages in thread
From: Ben Dooks @ 2011-07-20 10:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kukjin Kim, linux-next, linux-kernel, Thomas Abraham,
Nicolas Pitre, Arnd Bergmann
On Wed, Jul 20, 2011 at 11:35:36AM +1000, Stephen Rothwell wrote:
> Hi Kukjin,
>
> Today's linux-next merge of the s5p tree got conflicts in drivers/tty/serial/s3c2400.c and drivers/tty/serial/s3c24a0.c between commits 632b7cf6c056 ("ARM: mach-s3c2400: delete") and af0e060e24ce ("ARM: mach-s3c24a0: delete")from the arm-soc tree and commit 470805f8f958 ("serial: Remove redundant console_initcall from s3c and s5p console drivers") from the s5p tree.
>
> The former removes these files, so I did that.
Yes, there's little chance of these socs ever being added, so nico
removed all reference to them.
--
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: linux-next: manual merge of the s5p tree with the arm-soc tree
2011-07-20 1:35 linux-next: manual merge of the s5p tree with the arm-soc tree Stephen Rothwell
2011-07-20 10:13 ` Ben Dooks
@ 2011-07-20 10:30 ` Kukjin Kim
1 sibling, 0 replies; 3+ messages in thread
From: Kukjin Kim @ 2011-07-20 10:30 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Thomas Abraham',
'Nicolas Pitre', 'Arnd Bergmann', ben-linux
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi :)
> Today's linux-next merge of the s5p tree got conflicts in
drivers/tty/serial/s3c2400.c
> and drivers/tty/serial/s3c24a0.c between commits 632b7cf6c056 ("ARM: mach-
> s3c2400: delete") and af0e060e24ce ("ARM: mach-s3c24a0: delete")from the
arm-
> soc tree and commit 470805f8f958 ("serial: Remove redundant
console_initcall
> from s3c and s5p console drivers") from the s5p tree.
>
> The former removes these files, so I did that.
OK, you're right.
As a note, I fixed my -next tree just now to avoid conflicts between
arm-soc.
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
end of thread, other threads:[~2011-07-20 10:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-20 1:35 linux-next: manual merge of the s5p tree with the arm-soc tree Stephen Rothwell
2011-07-20 10:13 ` Ben Dooks
2011-07-20 10:30 ` Kukjin Kim
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).