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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
