RE: linux-next: manual merge of the s5p tree with the arm-soc tree
From: Kukjin Kim
Date: Wed Jul 20 2011 - 06:31:33 EST
Stephen Rothwell wrote:
> Hi Kukjin,
> Today's linux-next merge of the s5p tree got conflicts in
> and drivers/tty/serial/s3c24a0.c between commits 632b7cf6c056 ("ARM: mach-
> s3c2400: delete") and af0e060e24ce ("ARM: mach-s3c24a0: delete")from the
> soc tree and commit 470805f8f958 ("serial: Remove redundant
> 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
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/