Messages in this thread | | | Date | Wed, 20 Jul 2011 19:30:03 +0900 | From | Kukjin Kim <> | Subject | RE: linux-next: manual merge of the s5p tree with the arm-soc tree |
| |
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.
| |