archive mirror
 help / color / mirror / Atom feed
From: Thierry Reding <>
To: Greg Kroah-Hartman <>,
	Fabio Estevam <>,
	Sascha Hauer <>,
	Guenter Roeck <>
Subject: linux-next: manual merge of the tty-next tree
Date: Tue,  8 Oct 2013 15:44:15 +0200	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

Today's linux-next merge of the tty-next tree got a conflict in


caused by commits e2c2725 (serial: imx: Use NULL as the last argument of
add_preferred_console()) and b4e788d (Revert "serial: i.MX: evaluate
linux,stdout-path property").

The former commit only changes a parameter from 0 to NULL I assume it
doesn't solve the build breakage mentioned as reason for the revert, so
I kept the reversion.


  parent reply	other threads:[~2013-10-08 13:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09  1:25   ` Shawn Guo
2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding
2013-10-08 14:08   ` Jason Cooper
2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-08 13:44 ` Thierry Reding [this message]
2013-10-09  6:19   ` linux-next: manual merge of the tty-next tree Greg Kroah-Hartman

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* 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).