Re: [v4.4.40] patch backport error

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Wed, Jan 11, 2017 at 09:17:02PM +0100, Greg Kroah-Hartman wrote:
> On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote:
> > 
> > hi,
> > 
> > Bin Liu <b-liu@ti.com> writes:
> > > I am unable to figure out what was happening, but there seems to be a
> > > patch backport error in v4.4.40.
> > >
> > > Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a
> > > sensible value) is backported from upstream
> > > eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has
> > >
> > > +               _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;
> > >
> > > but eaa496ffaaf19591fe471a36cef366146eeb9153 has
> > >
> > > +               _ep->mult = usb_endpoint_maxp_mult(_ep->desc);
> > >
> > > they are not consistant.
> > >
> > > I haven't checked v4.9 yet, not sure if this happens there too.
> > 
> > oh-oh. you're correct, I sent the wrong patch :-(
> > 
> > I'll send a correct patch tomorrow. Greg, do you want a revert followed
> > by correct patch, or just fix-up patch?
> 
> A simple fixup is fine.

Hm, no, let me go revert these now, as I'm doing a release in an hour or
so.  Can you send me the "correct" backported patches, I'll take them
for the next round of stable kernels.

thanks,

greg k-h