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

2012-09-25 Thread 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 ac

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

2012-09-23 Thread Stephen Rothwell
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") fro