* linux-next: manual merge of the workqueues tree with the hid tree
@ 2012-08-21 3:58 Stephen Rothwell
2012-10-01 22:23 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-08-21 3:58 UTC (permalink / raw)
To: Tejun Heo
Cc: linux-next, linux-kernel, "Bruno Prémont", Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the workqueues tree with the hid tree
2012-08-21 3:58 linux-next: manual merge of the workqueues tree with the hid tree Stephen Rothwell
@ 2012-10-01 22:23 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2012-10-01 22:23 UTC (permalink / raw)
To: Stephen Rothwell, Tejun Heo; +Cc: linux-next, linux-kernel, Bruno Prémont
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-01 22:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-21 3:58 linux-next: manual merge of the workqueues tree with the hid tree Stephen Rothwell
2012-10-01 22:23 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).