From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kukjin Kim <kgene.kim@samsung•com>
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>
Subject: linux-next: manual merge of the s5p tree with the arm-soc tree
Date: Wed, 20 Jul 2011 11:35:36 +1000 [thread overview]
Message-ID: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2011-07-20 1:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-20 1:35 Stephen Rothwell [this message]
2011-07-20 10:13 ` linux-next: manual merge of the s5p tree with the arm-soc tree Ben Dooks
2011-07-20 10:30 ` Kukjin Kim
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=20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolas.pitre@linaro$(echo .)org \
--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