On Mon, Jun 10, 2013 at 01:55:16PM -0700, Greg KH wrote: > On Mon, Jun 10, 2013 at 12:20:18PM +0200, Markus Pargmann wrote: > > Hi, > > > > On Sun, Jun 09, 2013 at 10:54:47PM -0700, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > > > The patch below does not apply to the 3.9-stable tree. > > > If someone wants it applied there, or to any other stable or longterm > > > tree, then please email the backport, including the original git commit > > > id to <stable@xxxxxxxxxxxxxxx>. > > > > I couldn't reproduce the conflict for this patch on the 3.9 stable tree. > > Really? What did you do? I used cherry-pick. > > > How can I setup the correct 3.9-stable state with the conflict? > > Export the commit as a patch and try to apply it. It's obvious what the > conflict is, that file (drivers/irqchip/irq-mxs.c) is not present in the > 3.9.y tree... Thanks, I now realized that cherry-pick is using additional information to apply the patch. With export and apply I can reproduce the conflict. I will create the patch for 3.9 now. Regards, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html