linux-kernel - Re: linux-next: manual merge of the tty-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20131009061920.GA5645@kroah.com>
Date:	Tue, 8 Oct 2013 23:19:20 -0700
From:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:	Thierry Reding <thierry.reding@...il.com>
Cc:	Fabio Estevam <fabio.estevam@...escale.com>,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Guenter Roeck <linux@...ck-us.net>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the tty-next tree

On Tue, Oct 08, 2013 at 03:44:15PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the tty-next tree got a conflict in
> 
> 	drivers/tty/serial/imx.c
> 
> 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.

That sounds correct, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/