From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Thomas Abraham' <thomas.ab@samsung•com>,
'Nicolas Pitre' <nicolas.pitre@linaro•org>,
'Arnd Bergmann' <arnd@arndb•de>,
ben-linux@fluff•org
Subject: RE: linux-next: manual merge of the s5p tree with the arm-soc tree
Date: Wed, 20 Jul 2011 19:30:03 +0900 [thread overview]
Message-ID: <064101cc46c8$240fcac0$6c2f6040$%kim@samsung.com> (raw)
In-Reply-To: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au>
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.
prev parent reply other threads:[~2011-07-20 10:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='064101cc46c8$240fcac0$6c2f6040$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=ben-linux@fluff$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolas.pitre@linaro$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thomas.ab@samsung$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox