From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Adrian Bunk <bunk@kernel.org>,
linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org,
Mackerras <paulus@samba.org>,
Paul
Subject: linux-next: manual merge of the ttydev tree
Date: Tue, 1 Jul 2008 20:59:55 +1000 [thread overview]
Message-ID: <20080701205955.a78a979b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/serial/cpm_uart/cpm_uart_core.c between commit
0b2a2e5b7747f1f63bd86ca22b5c6097da5b2137 ("cpm_uart: Remove
!CONFIG_PPC_CPM_NEW_BINDING code") from the powerpc tree and commit
33e211d606d46d18befa6fe6aec76aa7971eefa8 ("03-serial_vcs") from the
ttydev tree.
The former removes some of the code modified by the latter. It is a
simple fixup and I can carry it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
reply other threads:[~2008-07-01 11:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080701205955.a78a979b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=bunk@kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox