diff for duplicates of <20161116095753.GA4947@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 9f4f3cd..13aa46c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,23 +7,23 @@ On Tue, Nov 15, 2016 at 12:05:29PM +0100, Wolfgang Ocker wrote: > > Signed-off-by: Wolfgang Ocker <weo@reccoware.de> > --- -> drivers/tty/serial/mxs-auart.c | 2 +- -> 1 file changed, 1 insertion(+), 1 deletion(-) +> ?drivers/tty/serial/mxs-auart.c | 2 +- +> ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c > index 770454e0dfa3..8c1c9112b3fd 100644 > --- a/drivers/tty/serial/mxs-auart.c > +++ b/drivers/tty/serial/mxs-auart.c > @@ -1016,7 +1016,7 @@ static void mxs_auart_settermios(struct uart_port *u, -> ctrl |= AUART_LINECTRL_EPS; -> } -> +> ? ctrl |= AUART_LINECTRL_EPS; +> ? } +> ? > - u->read_status_mask = 0; > + u->read_status_mask = AUART_STAT_OERR; -> -> if (termios->c_iflag & INPCK) -> u->read_status_mask |= AUART_STAT_PERR; -> -- +> ? +> ? if (termios->c_iflag & INPCK) +> ? u->read_status_mask |= AUART_STAT_PERR; +> --? > 2.10.0 This patch is corrupted and can not be applied, what did you do here? diff --git a/a/content_digest b/N1/content_digest index 6e886e4..21c232e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,8 @@ "ref\01479207929.4985.25.camel@reccoware.de\0" - "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" - "Subject\0Re: [PATCH] mxs-auart: count FIFO overrun errors\0" + "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" + "Subject\0[PATCH] mxs-auart: count FIFO overrun errors\0" "Date\0Wed, 16 Nov 2016 10:57:53 +0100\0" - "To\0Wolfgang Ocker <weo@reccoware.de>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-kernel@vger.kernel.org - linux-serial@vger.kernel.org - " Jiri Slaby <jslaby@suse.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Nov 15, 2016 at 12:05:29PM +0100, Wolfgang Ocker wrote:\n" @@ -18,23 +14,23 @@ "> \n" "> Signed-off-by: Wolfgang Ocker <weo@reccoware.de>\n" "> ---\n" - "> \302\240drivers/tty/serial/mxs-auart.c | 2 +-\n" - "> \302\2401 file changed, 1 insertion(+), 1 deletion(-)\n" + "> ?drivers/tty/serial/mxs-auart.c | 2 +-\n" + "> ?1 file changed, 1 insertion(+), 1 deletion(-)\n" "> \n" "> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c\n" "> index 770454e0dfa3..8c1c9112b3fd 100644\n" "> --- a/drivers/tty/serial/mxs-auart.c\n" "> +++ b/drivers/tty/serial/mxs-auart.c\n" "> @@ -1016,7 +1016,7 @@ static void mxs_auart_settermios(struct uart_port *u,\n" - "> \302\240\t\t\tctrl |= AUART_LINECTRL_EPS;\n" - "> \302\240\t}\n" - "> \302\240\n" + "> ?\t\t\tctrl |= AUART_LINECTRL_EPS;\n" + "> ?\t}\n" + "> ?\n" "> -\tu->read_status_mask = 0;\n" "> +\tu->read_status_mask = AUART_STAT_OERR;\n" - "> \302\240\n" - "> \302\240\tif (termios->c_iflag & INPCK)\n" - "> \302\240\t\tu->read_status_mask |= AUART_STAT_PERR;\n" - "> --\302\240\n" + "> ?\n" + "> ?\tif (termios->c_iflag & INPCK)\n" + "> ?\t\tu->read_status_mask |= AUART_STAT_PERR;\n" + "> --?\n" "> 2.10.0\n" "\n" "This patch is corrupted and can not be applied, what did you do here?\n" @@ -45,4 +41,4 @@ "\n" greg k-h -c0273c024b61acbcc1e150b6d80b4ed95e37e4f5e9279d44f74ebc416882dea4 +f44cef523b977c040b6b933322e1203ac433b7e050ad93267e3abbe232a681df
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.