On Wed, Sep 21, 2016 at 03:01:19PM +0100, Scott Telford wrote: > From: Anirudha Sarangi <anirudha.sarangi@xxxxxxxxxx> > > The existing interrupt handling logic has following issues. > - Upon a parity error with default configuration, the control > never comes out of the ISR thereby hanging Linux. > - The error handling logic around framing and parity error are buggy. > There are chances that the errors will never be captured. > This patch ensures that the status registers are cleared on all cases so > that a hang situation never arises. > > Signed-off-by: Anirudha Sarangi <anirudh@xxxxxxxxxx> > Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx> > [stelford@xxxxxxxxxxx: cherry picked from > https://github.com/Xilinx/linux-xlnx commit > ac297e20d399850d7a8e373b6eccf2e183c15165 with manual conflict resolution] > Signed-off-by: Scott Telford <stelford@xxxxxxxxxxx> > > --- > Changes in v2: > - Changed order of cdns_uart_handle_{rx,tx}() to match existing order, > to avoid obfuscating the salient changes; revised commit message to omit > changes lost in conflict resolution. > --- > drivers/tty/serial/xilinx_uartps.c | 189 ++++++++++++++++++++----------------- > 1 file changed, 100 insertions(+), 89 deletions(-) This patch doesn't apply to my tree, can you resync and resend the rest of this series? thanks, greg k-h -- 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