linux-next: manual merge of the tty tree with the workqueues tree

linux-next: manual merge of the tty tree with the workqueues tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/omap-serial.c between commit 43829731dd37 ("workqueue:
deprecate flush[_delayed]_work_sync()") from the workqueues tree and
commit ac57e7f38ea6 ("serial: omap: Remove unnecessary checks from
suspend/resume") 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/omap-serial.c
index 0952d71,3c05c5e..0000000
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -1203,10 -1222,8 +1222,8 @@@ static int serial_omap_suspend(struct d
  {
  	struct uart_omap_port *up = dev_get_drvdata(dev);
  
- 	if (up) {
- 		uart_suspend_port(&serial_omap_reg, &up->port);
- 		flush_work(&up->qos_work);
- 	}
+ 	uart_suspend_port(&serial_omap_reg, &up->port);
 -	flush_work_sync(&up->qos_work);
++	flush_work(&up->qos_work);
  
  	return 0;
  }

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

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

[Greg KH]

On Mon, Sep 24, 2012 at 04:36:09PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/omap-serial.c between commit 43829731dd37 ("workqueue:
> deprecate flush[_delayed]_work_sync()") from the workqueues tree and
> commit ac57e7f38ea6 ("serial: omap: Remove unnecessary checks from
> suspend/resume") from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks fine to me, thanks.

greg k-h