On 01/07/2013, at 10:04, Linus Walleij <[email protected]> wrote:
> On Sun, Jun 30, 2013 at 2:25 AM, Javier Martinez Canillas > <[email protected]> wrote: > >> Yes, It doesn't apply cleanly to your "next" branch cleanly because >> this patch-set depends on the following bugfix patch merged late on >> the -rc cycle (3.10-rc7): >> >> 397eada9 ("gpio/omap: don't use linear domain mapping for OMAP1") > > Aha, well this fix was only CC:ed to Grant so I never saw it > happen. Obviously it cannot be merged through my GPIO tree > then. > Yes, sorry about that. I didn't do a proper post of that patch but it was proposed on a very long thread [1] about a regression for GPIO in OMAP1 platforms. Then Tony took the patch and send a pull request to Grant. I just saw you were not cc'ed. >> So, I could change the patches so they can be applied cleanly on your >> branch but then it will not apply cleanly when you send your pull >> request to Torvalds. > > That will probably not work as it would cause even more conflicts > upstream, and now the merge window is open so no way can I > rebase the tree either. > > Let's see if we can cram it in as part of a late v3.11 merge or > if we'll have to defer to v3.12. > Ok no worries. Since these patches fixes an actual issue (using a GPIO as IRQ) I guess they still can be sent as part of the v3.11 -rc cycle gpio fixes. > Yours, > Linus Walleij Thanks a lot and best regards, Javier [1]: http://comments.gmane.org/gmane.linux.ports.arm.kernel/236198-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
