* [v4.4.40] patch backport error
@ 2017-01-11 17:13 Bin Liu
2017-01-11 17:13 ` Felipe Balbi
2017-01-11 17:27 ` Bin Liu
0 siblings, 2 replies; 7+ messages in thread
From: Bin Liu @ 2017-01-11 17:13 UTC (permalink / raw)
To: stable; +Cc: Greg Kroah-Hartman, linux-usb, Felipe Balbi
Hi,
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.
Regards,
-Bin.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [v4.4.40] patch backport error
2017-01-11 17:13 [v4.4.40] patch backport error Bin Liu
@ 2017-01-11 17:13 ` Felipe Balbi
2017-01-11 17:22 ` Bin Liu
2017-01-11 20:17 ` Greg Kroah-Hartman
2017-01-11 17:27 ` Bin Liu
1 sibling, 2 replies; 7+ messages in thread
From: Felipe Balbi @ 2017-01-11 17:13 UTC (permalink / raw)
To: Bin Liu, stable; +Cc: Greg Kroah-Hartman, linux-usb
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?
--
balbi
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [v4.4.40] patch backport error
2017-01-11 17:13 ` Felipe Balbi
@ 2017-01-11 17:22 ` Bin Liu
2017-01-11 17:28 ` Felipe Balbi
2017-01-11 20:17 ` Greg Kroah-Hartman
1 sibling, 1 reply; 7+ messages in thread
From: Bin Liu @ 2017-01-11 17:22 UTC (permalink / raw)
To: Felipe Balbi; +Cc: stable, Greg Kroah-Hartman, linux-usb
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 :-(
so you sent a separate set to stable? I thought it was directly back
ported from upstream which has the correct version?
Regards,
-Bin.
>
> I'll send a correct patch tomorrow. Greg, do you want a revert followed
> by correct patch, or just fix-up patch?
>
> --
> balbi
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [v4.4.40] patch backport error
2017-01-11 17:22 ` Bin Liu
@ 2017-01-11 17:28 ` Felipe Balbi
0 siblings, 0 replies; 7+ messages in thread
From: Felipe Balbi @ 2017-01-11 17:28 UTC (permalink / raw)
To: Bin Liu; +Cc: stable, Greg Kroah-Hartman, linux-usb
Hi,
Bin Liu <b-liu@ti.com> writes:
> 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 :-(
>
> so you sent a separate set to stable? I thought it was directly back
> ported from upstream which has the correct version?
well, it had to be manually backported to do away with the dependency on
usb_endpoint_maxp_mult(), but I ended up reimplementing
usb_endpoint_maxp() correctly instead of actually extracting high bits
of wMaxPacketSize
--
balbi
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [v4.4.40] patch backport error
2017-01-11 17:13 ` Felipe Balbi
2017-01-11 17:22 ` Bin Liu
@ 2017-01-11 20:17 ` Greg Kroah-Hartman
2017-01-12 7:51 ` Greg Kroah-Hartman
1 sibling, 1 reply; 7+ messages in thread
From: Greg Kroah-Hartman @ 2017-01-11 20:17 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Bin Liu, stable, linux-usb
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.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [v4.4.40] patch backport error
2017-01-11 20:17 ` Greg Kroah-Hartman
@ 2017-01-12 7:51 ` Greg Kroah-Hartman
0 siblings, 0 replies; 7+ messages in thread
From: Greg Kroah-Hartman @ 2017-01-12 7:51 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Bin Liu, stable, linux-usb
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [v4.4.40] patch backport error
2017-01-11 17:13 [v4.4.40] patch backport error Bin Liu
2017-01-11 17:13 ` Felipe Balbi
@ 2017-01-11 17:27 ` Bin Liu
1 sibling, 0 replies; 7+ messages in thread
From: Bin Liu @ 2017-01-11 17:27 UTC (permalink / raw)
To: stable, Greg Kroah-Hartman, linux-usb, Felipe Balbi
On Wed, Jan 11, 2017 at 11:13:05AM -0600, Bin Liu wrote:
> Hi,
>
> 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.
v4.9 seem to have the same issue too.
Regards,
-Bin.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-01-12 7:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-11 17:13 [v4.4.40] patch backport error Bin Liu
2017-01-11 17:13 ` Felipe Balbi
2017-01-11 17:22 ` Bin Liu
2017-01-11 17:28 ` Felipe Balbi
2017-01-11 20:17 ` Greg Kroah-Hartman
2017-01-12 7:51 ` Greg Kroah-Hartman
2017-01-11 17:27 ` Bin Liu
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).