On Sun, Jun 30, 2013 at 2:25 AM, Javier Martinez Canillas <martinez.jav...@gmail.com> 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. > 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. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html