Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch
tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222
("ipack/devices/ipoctal: fix kernel bug when using pppd"),
e7e664fd688a ("ipack/devices/ipoctal: protect the channel data processing
with a spinlock") and b06073f963b7 ("ipack/devices/ipoctal: remove
redundant tty_flip_buffer_push()") from the char-misc 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/ipack/devices/ipoctal.c
index ab20a08,0b3c4b8..0000000
--- a/drivers/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@@ -133,11 -123,11 +123,11 @@@ static int ipoctal_get_icount(struct tt
  	return 0;
  }
  
 -static void ipoctal_irq_rx(struct ipoctal_channel *channel,
 -			   struct tty_struct *tty, u8 sr)
 +static void ipoctal_irq_rx(struct ipoctal_channel *channel, u8 sr)
  {
 +	struct tty_port *port = &channel->tty_port;
  	unsigned char value;
- 	unsigned char flag = TTY_NORMAL;
+ 	unsigned char flag;
  	u8 isr;
  
  	do {
@@@ -208,11 -188,13 +188,8 @@@ static void ipoctal_irq_tx(struct ipoct
  static void ipoctal_irq_channel(struct ipoctal_channel *channel)
  {
  	u8 isr, sr;
 -	struct tty_struct *tty;
 -
 -	tty = tty_port_tty_get(&channel->tty_port);
 -	if (!tty)
 -		return;
  
- 	/* If there is no client, skip the check */
- 	if (!atomic_read(&channel->open))
- 		return;
- 
+ 	spin_lock(&channel->lock);
  	/* The HW is organized in pair of channels.  See which register we need
  	 * to read from */
  	isr = ioread8(&channel->block_regs->r.isr);
@@@ -237,7 -218,8 +213,7 @@@
  	if ((isr & channel->isr_tx_rdy_mask) && (sr & SR_TX_READY))
  		ipoctal_irq_tx(channel);
  
- 	tty_flip_buffer_push(&channel->tty_port);
 -	tty_kref_put(tty);
+ 	spin_unlock(&channel->lock);
  }
  
  static irqreturn_t ipoctal_irq_handler(void *arg)