linux-next: manual merge of the char-misc tree with the tty tree

linux-next: manual merge of the char-misc tree with the tty tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the char-misc tree got conflicts in:

  drivers/tty/n_tracerouter.c
  drivers/tty/n_tracesink.c

between commit:

  3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer")

from the tty tree and commit:

  8ba59e9dee31 ("misc: pti: Remove driver for deprecated platform")

from the char-misc tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the tty tree

[Greg KH]

On Fri, Jan 29, 2021 at 03:53:41PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got conflicts in:
> 
>   drivers/tty/n_tracerouter.c
>   drivers/tty/n_tracesink.c
> 
> between commit:
> 
>   3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer")
> 
> from the tty tree and commit:
> 
>   8ba59e9dee31 ("misc: pti: Remove driver for deprecated platform")
> 
> from the char-misc tree.

Thanks, I knew this would happen :(

Re: linux-next: manual merge of the char-misc tree with the tty tree

[Stephen Rothwell]

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

Hi all,

On Fri, 29 Jan 2021 15:53:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the char-misc tree got conflicts in:
> 
>   drivers/tty/n_tracerouter.c
>   drivers/tty/n_tracesink.c
> 
> between commit:
> 
>   3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer")
> 
> from the tty tree and commit:
> 
>   8ba59e9dee31 ("misc: pti: Remove driver for deprecated platform")
> 
> from the char-misc tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the tty tree

[Greg KH]

On Mon, Feb 11, 2013 at 04:37:14PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c ("TTY:
> switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to
> | for bit operations") from the tty tree and commit 3d55399391c8 ("pcmcia: synclink_cs: cleanup checkpatch warnings") from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks good, thanks.

greg k-h

linux-next: manual merge of the char-misc tree with the tty tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c ("TTY:
switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to
| for bit operations") from the tty tree and commit 3d55399391c8 ("pcmcia: synclink_cs: cleanup checkpatch warnings") 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/char/pcmcia/synclink_cs.c
index d0c9852,29f6bec..0000000
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@@ -765,8 -771,11 +771,8 @@@ static void bh_handler(struct work_stru
  	struct tty_struct *tty;
  	int action;
  
 -	if (!info)
 -		return;
 -
  	if (debug_level >= DEBUG_LEVEL_BH)
- 		printk( "%s(%d):bh_handler(%s) entry\n",
+ 		printk("%s(%d):bh_handler(%s) entry\n",
  			__FILE__,__LINE__,info->device_name);
  
  	info->bh_running = true;
@@@ -889,8 -898,16 +896,8 @@@ static void rx_ready_async(MGSLPC_INFO 
  	unsigned char data, status, flag;
  	int fifo_count;
  	int work = 0;
-  	struct mgsl_icount *icount = &info->icount;
+ 	struct mgsl_icount *icount = &info->icount;
  
 -	if (!tty) {
 -		/* tty is not available anymore */
 -		issue_command(info, CHA, CMD_RXRESET);
 -		if (debug_level >= DEBUG_LEVEL_ISR)
 -			printk("%s(%d):rx_ready_async(tty=NULL)\n", __FILE__, __LINE__);
 -		return;
 -	}
 -
  	if (tcd) {
  		/* early termination, get FIFO count from RBCL register */
  		fifo_count = (unsigned char)(read_reg(info, CHA+RBCL) & 0x1f);
@@@ -1342,8 -1359,8 +1349,8 @@@ static void shutdown(MGSLPC_INFO * info
  	/* TODO:disable interrupts instead of reset to preserve signal states */
  	reset_device(info);
  
-  	if (!tty || tty->termios.c_cflag & HUPCL) {
+ 	if (!tty || tty->termios.c_cflag & HUPCL) {
 -		info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
  		set_signals(info);
  	}
  
@@@ -1405,12 -1422,12 +1412,12 @@@ static void mgslpc_change_params(MGSLPC
  
  	cflag = tty->termios.c_cflag;
  
 -	/* if B0 rate (hangup) specified then negate DTR and RTS */
 -	/* otherwise assert DTR and RTS */
 +	/* if B0 rate (hangup) specified then negate RTS and DTR */
 +	/* otherwise assert RTS and DTR */
-  	if (cflag & CBAUD)
+ 	if (cflag & CBAUD)
 -		info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
 +		info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
  	else
 -		info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
  
  	/* byte size and parity */
  
@@@ -2301,10 -2318,10 +2308,10 @@@ static void mgslpc_set_termios(struct t
  	/* Handle transition to B0 status */
  	if (old_termios->c_cflag & CBAUD &&
  	    !(tty->termios.c_cflag & CBAUD)) {
 -		info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
- 		spin_lock_irqsave(&info->lock,flags);
- 	 	set_signals(info);
- 		spin_unlock_irqrestore(&info->lock,flags);
+ 		spin_lock_irqsave(&info->lock, flags);
+ 		set_signals(info);
+ 		spin_unlock_irqrestore(&info->lock, flags);
  	}
  
  	/* Handle transition away from B0 status */
@@@ -2462,13 -2479,13 +2469,13 @@@ static void dtr_rts(struct tty_port *po
  	MGSLPC_INFO *info = container_of(port, MGSLPC_INFO, port);
  	unsigned long flags;
  
- 	spin_lock_irqsave(&info->lock,flags);
+ 	spin_lock_irqsave(&info->lock, flags);
  	if (onoff)
 -		info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;
 +		info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;
  	else
 -		info->serial_signals &= ~SerialSignal_RTS + SerialSignal_DTR;
 +		info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
  	set_signals(info);
- 	spin_unlock_irqrestore(&info->lock,flags);
+ 	spin_unlock_irqrestore(&info->lock, flags);
  }
  
  

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

Re: linux-next: manual merge of the char-misc tree with the tty tree

[Samuel Iglesias Gonsalvez]

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

On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote:
> 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).

Looks good to me.

Thanks!

Sam

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

linux-next: manual merge of the char-misc tree with the tty tree

[Stephen Rothwell]

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

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)

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