[PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support

Linus Walleij linus.walleij at linaro.org
Fri May 11 08:29:28 EDT 2012


On Fri, May 11, 2012 at 7:32 AM, Shawn Guo <shawn.guo at linaro.org> wrote:

> pinctrl-mergebase-20120418 is not enough for me.  I need mxs and dummy
> states support.  So if your devel branch will never be rebased, we can
> simply ask Arnd and Olof to get that as the dependent branch?

Hm, yes the devel branch is getting real stable now, so I will only add things
on top.

Basically the for-next branch is supposed to be even more stable,
but right now it's a copy of devel.

ARM SoC guys: how do you want the pinctrl deps? I can make
a tag today if that is preferred.

Also: short-cut to another subject: how have you other guys managed
this? By e.g.:

git fetch <pinctrl tree>

git checkout -b my-pinwork v3.4-rc4
git merge pinctrl-tag
(develop develop)

Or:

git checkout -b my-pinwork pinctrl-tag

?

I was a bit uncertain on how to do this for the pending Ux500
stuff so better ask. I merged it for now but maybe it's better if
I just base the whole pullrequest on top of a stable pinctrl
branch?

Yours,
Linus Walleij



More information about the linux-arm-kernel mailing list