From: Ben Dooks <ben@trinity.fluff.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kukjin Kim <kgene.kim@samsung.com>,
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: Re: linux-next: manual merge of the s5p tree with the arm-soc tree
Date: Wed, 20 Jul 2011 11:13:58 +0100 [thread overview]
Message-ID: <20110720101358.GT21138@trinity.fluff.org> (raw)
In-Reply-To: <20110720113536.72c28c19d623c5e7f8604ca2@canb.auug.org.au>
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.
next prev parent reply other threads:[~2011-07-20 10:14 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 [this message]
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=20110720101358.GT21138@trinity.fluff.org \
--to=ben@trinity.fluff.org \
--cc=arnd@arndb.de \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=thomas.ab@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.