On Tue, May 12, 2015 at 03:00:27PM +0100, Jakub Kiciński wrote: > On Tue, 12 May 2015 14:44:26 +0100, Dave Martin wrote: > > This will cause a conflict with tty-next because it pulls forward > > some changes made by commit 1e84d22 (serial/amba-pl011: Refactor and > > simplify TX FIFO handling); however, the resolution is simple except > > for the following lines which may need to be deleted manually from > > amba-pl011.c:pl011_startup(): > > By resolution is simple you mean: keep the code as it is in tty-next, > right? Yes, that's right. Cheers ---Dave -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html