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

2012-10-01 Thread Jiri Kosina
On Tue, 21 Aug 2012, Stephen Rothwell wrote: > Hi Tejun, > > Today's linux-next merge of the workqueues tree got a conflict in > drivers/hid/hid-picolcd.c between commit fabdbf2fd22f ("HID: picoLCD: > split driver code") from the hid tree and commit 43829731dd37 > ("workqueue: deprecate flush[_de

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

2012-08-20 Thread Stephen Rothwell
Hi Tejun, Today's linux-next merge of the workqueues tree got a conflict in drivers/hid/hid-picolcd.c between commit fabdbf2fd22f ("HID: picoLCD: split driver code") from the hid tree and commit 43829731dd37 ("workqueue: deprecate flush[_delayed]_work_sync()") from the workqueues tree. The former