On Thu, 6 Sep 2012, Tejun Heo wrote: > > > The flush_delayed_work_sync function is deprecated, > > > we can instead call flush_delayed_work directly. > > > > > > Sparse is giving a warning: > > > drivers/hid/hid-picolcd_fb.c:611:2: warning: > > > ‘flush_delayed_work_sync’ is deprecated > > > (declared at include/linux/workqueue.h:454) > > > [-Wdeprecated-declarations] > > > > > > Signed-off-by: Emil Goode <emilgoode@xxxxxxxxx> > > > > Acked-by: Bruno Prémont <bonbons@xxxxxxxxxxxxxxxxx> > > > > This matches a patch by Tejun a few weeks ago which was partially > > skipped in -next due to merge conflict with code split in picoLCD. > > > > See http://comments.gmane.org/gmane.linux.kernel.next/23740 > > > > For the sake of proper bisectability, this should go in after > > Tejun's workqueue changes (if needed at all depending on how merge > > happens during pull by Linus). > > Yeah, we either can ask Linus to fix it up during merge or send a > separate patch afterwards. In this case, I don't think it matters too > much either way. I tend to send out pull request fairly early in the > merge window, I'll try to remember to poke Linus about the merge > conflict. Okay, fair enough. I'll try not to forget to CC you on my pull request which will include those picolcd changes, and mention the potential conflict to Linus as well. We'll see which one goes in first :) Thanks, -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html