Messages in this thread | | | Date | Wed, 1 Feb 2012 13:49:32 -0800 | Subject | Re: [PATCH 3/4] ARM: tegra: Switch to new pinctrl driver | From | Olof Johansson <> |
| |
On Wed, Feb 1, 2012 at 12:11 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Wed, Feb 1, 2012 at 9:20 AM, Olof Johansson <olof@lixom.net> wrote: > >> This series is: >> Acked-by: Olof Johansson <olof@lixom.net> > > OK that's great! > >> can you land this series in a stable branch in >> your tree that you promise not to rebase between now and upstream >> submission? > > I thinkso, I rebased to some fixes from -rc2 today but no need to > do that again, there is one bug fix which may end up in both > mainline and my tree but whatever, git will cope.
Ok, yeah that should be fine. Alternatively, applying only these patches on a separate branch that you pull into your main for-3.4 branch means that if you have to rebase the rest of for-3.4 you can get away with it as long as you yet again only pull in this branch instead of include it in the rebase.
> However I am waiting for Stephen to do some fixes and arrive > at a final version first.
Sounds good.
-Olof
| |