On 10/23/2013 04:54 PM, Marc Kleine-Budde wrote: > Hello Greg, > > On 10/11/2013 07:21 PM, Greg KH wrote: >> On Fri, Oct 11, 2013 at 09:37:26AM +0200, Marc Kleine-Budde wrote: >>> On 10/11/2013 02:02 AM, gregkh@xxxxxxxxxxxxxxxxxxx wrote: >>>> >>>> This is a note to let you know that I've just added the patch titled >>>> >>>> can: flexcan: fix flexcan_chip_start() on imx6 >>>> >>>> to the 3.11-stable tree which can be found at: >>>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary >>>> >>>> The filename of the patch is: >>>> can-flexcan-fix-flexcan_chip_start-on-imx6.patch >>>> and it can be found in the queue-3.11 subdirectory. >>>> >>>> If you, or anyone else, feels it should not be added to the stable tree, >>>> please let <stable@xxxxxxxxxxxxxxx> know about it. >>> >>> Please postpone this stable patch, as it introduces a regression on >>> other SoCs. The fix: >>> >>> d5a7b40 can: flexcan: flexcan_chip_start: >>> fix regression, mark one MB for TX and abort pending TX >>> >>> is already on its way upstream, it's currently in David Miller's >>> net/master repo. Once both patches can be applied, please do it. >> >> Ok, now removed from 3.11, 3.10, and 3.4 stable queues. >> >> Please let me know the git commit id of the patch when it hits Linus's >> tree and I will queue both of these up. > > both patches are now in linus/master, please queue these for the stable > trees: > > e358784 can: flexcan: fix mx28 detection by rearanging OF match table > d5a7b40 can: flexcan: flexcan_chip_start: fix regression, mark one MB > for TX and abort pending TX Damn, probably had too much jummy Scottish food :) The correct patches are of course: d5a7b40 can: flexcan: flexcan_chip_start: fix regression, mark one MB for TX and abort pending TX 0d1862e can: flexcan: fix flexcan_chip_start() on imx6 Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature