linux-next: manual merge of the tty tree with the tty.current tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>
Subject: linux-next: manual merge of the tty tree with the tty.current tree
Date: Thu, 17 Jan 2013 13:07:38 +1100	[thread overview]
Message-ID: <20130117130738.b3d750f70143792e9471063c@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250/8250_dw.c between commit 68e56cb3a068 ("tty:
8250_dw: Fix inverted arguments to serial_out in IRQ handler") from the
tty.current tree and commit 30046df26187 ("serial: 8250_dw: Set FIFO size
dynamically") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/tty/serial/8250/8250_dw.c
index 096d2ef,117bb8b..0000000

--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@@ -78,8 -104,8 +104,8 @@@ static int dw8250_handle_irq(struct uar
  		return 1;
  	} else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
  		/* Clear the USR and write the LCR again. */
- 		(void)p->serial_in(p, UART_USR);
+ 		(void)p->serial_in(p, DW_UART_USR);
 -		p->serial_out(p, d->last_lcr, UART_LCR);
 +		p->serial_out(p, UART_LCR, d->last_lcr);
  
  		return 1;
  	}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
