Re: [PATCH] HID: wacom: fix timeout on probe for some wacoms

[Jiri Kosina]

On Mon, 22 Sep 2014, Benjamin Tissoires wrote:

> > > I run into this today while trying to improve the generic support of 
> > > the ISDv4 sensors (those found on laptops not sold by Wacom). This 
> > > is a regression from 3.16, in a sense that it can add up to 10 
> > > seconds to the boot of the laptop. So IMO, this should go as a fix 
> > > for 3.17-rc6.
> > > 
> > > Unfortunately, c64d883476 changed the ABI and wacom_get_report() takes now one
> > > less argument. I based my patch on top of the for-3.18/wacom branch, so in 3.17,
> > > it will not compile.
> > > I would personally be in favor of having c64d883476 and this one in 3.17, but
> > > c64d883476 will also require some manual conflict resolution (cherry-pick is
> > > complaining).
> > > I can also resend it based on the v3.17-rc5 tag, but then we will have to update
> > > the for-3.18/wacom when you will merge with Linus' tree.
> > 
> > Hi Benjamin,
> > 
> > c64d883476 is not really a rc7 material, so I'd not like to be 
> > cherry-picking it for this.
> > 
> > My take on this would actually be to apply to for-3.18/wacom, mark it for 
> > stable, and then make sure that c64d883476 makes it to the first 
> > 3.17-stable.
> > 
> > What do you think?
> > 
> 
> Fine by me. It will be easier to include the follow up patches this way.

Ok, applied to for-3.18/wacom, annotated for stable (and made a note about 
the need of cherry-picking pre-requisite commit c64d883476) and pushed 
out.

Thanks,

-- 
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/