From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38436 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876AbdALHuo (ORCPT ); Thu, 12 Jan 2017 02:50:44 -0500 Date: Thu, 12 Jan 2017 08:51:05 +0100 From: Greg Kroah-Hartman To: Felipe Balbi Cc: Bin Liu , stable@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [v4.4.40] patch backport error Message-ID: <20170112075105.GA24399@kroah.com> References: <20170111171305.GB18730@uda0271908> <87pojt5xl1.fsf@linux.intel.com> <20170111201702.GD16314@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170111201702.GD16314@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: 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 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