On Thu, 6 Sep 2012, Tejun Heo wrote: > > > 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 <emilgo...@gmail.com> > > > > Acked-by: Bruno Prémont <bonb...@linux-vserver.org> > > > > 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.
Linus has just pulled from me, so if you could take care of this merge conflict, that'd be awesome. Thanks, -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
