From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Voss,
Nikolaus" <N.Voss@weinmann.de>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: linux-next: manual merge of the tty tree with Linus' tree
Date: Tue, 25 Oct 2011 19:18:40 +1100 [thread overview]
Message-ID: <20111025191840.329d2a862d549ec6fe6b242f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5
("atmel_serial: fix atmel_default_console_device") from Linus' tree and
commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate ports")
from the tty tree.
I just used the tty tree version (which may not be completely correct).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-10-25 8:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 8:18 Stephen Rothwell [this message]
2011-10-25 10:03 ` linux-next: manual merge of the tty tree with Linus' tree Nicolas Ferre
2011-10-25 10:05 ` [PATCH] tty/serial: atmel_serial: fixup merge conflict Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2020-03-10 3:40 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2020-03-10 9:04 ` Greg KH
2020-03-10 10:52 ` Jiri Slaby
2020-03-16 6:38 ` Jiri Slaby
2020-03-16 7:46 ` Greg KH
2020-03-16 6:34 ` Jiri Slaby
2016-05-20 2:31 Stephen Rothwell
2016-05-21 3:26 ` Greg KH
2014-05-05 5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2013-01-21 3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH
2013-01-17 2:04 Stephen Rothwell
2013-01-18 0:41 ` Greg KH
2011-10-25 8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-02-24 5:34 Stephen Rothwell
2011-02-24 19:39 ` Greg KH
2011-02-25 5:11 ` Stephen Rothwell
2011-02-25 5:48 ` Greg KH
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=20111025191840.329d2a862d549ec6fe6b242f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=N.Voss@weinmann.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.ferre@atmel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).