Skip to contentSkip to conversation

patch backport error

v4.4.40 Bin Liu 3 participants 7 messages Jan 11, 2017 – Jan 12, 2017 Stable branch

lore
Share & tools
lore

Bin Liu

author
#0 lore raw

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.

#1 lore raw

hi,

Quoted 9 lines · Bin Liu

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;

Quoted 7 lines

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?

Signature · 1 line
balbi
author
#2 lore raw
Quoted 15 lines · Felipe Balbi

hi,

Quoted 11 lines · Bin Liu

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

Quoted 7 lines
Quoted 5 lines

+ _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.

Quoted 6 lines

I'll send a correct patch tomorrow. Greg, do you want a revert followed by correct patch, or just fix-up patch?

Signature · 1 line
balbi
author
#6 lore raw
In reply to Bin Liu
Quoted 11 lines · Bin Liu

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;

Quoted 7 lines

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.

#3 lore raw
In reply to Bin Liu

Hi,

Quoted 18 lines · Bin Liu
Quoted 17 lines · Felipe Balbi

hi,

Quoted 13 lines · Bin Liu

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);

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

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

Signature · 1 line
balbi
#4 lore raw
In reply to Felipe Balbi
Quoted 17 lines · Felipe Balbi

hi,

Quoted 13 lines · Bin Liu

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);

Quoted 8 lines
Quoted 3 lines

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

#5 lore raw
Quoted 20 lines · Greg Kroah-Hartman
Quoted 19 lines · Felipe Balbi

hi,

Quoted 15 lines · Bin Liu

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.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

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