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

[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[_delayed]_work_sync()") from the workqueues
> tree.
> 
> The former commit moved the code changed by the latter into a new file
> (and removed the old file) and then a later commit removed the call to
> flush_work_sync().  I just removed the file.

The same here. My part is now in Linus' tree -- Tejun, could you please 
sort this out on your side?

Thanks a lot,

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/