From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
Date: Fri, 11 May 2012 13:27:42 +0000 [thread overview]
Message-ID: <201205111327.42883.arnd@arndb.de> (raw)
In-Reply-To: <CACRpkdY3Ga0soie+tsALxA1yhzXbyVOj_HbLLWOjRPz6cMLqtQ@mail.gmail.com>
On Friday 11 May 2012, Linus Walleij wrote:
> On Fri, May 11, 2012 at 7:32 AM, Shawn Guo <shawn.guo@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.
No need for a signed tag, since we're not going to submit you changes
upstream. Knowing that we can pull in the for-next branch is good enough,
so we'll do that for anything that needs it.
> 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?
No strong preference on my side. I've seen both ways getting done.
In arm-soc we try to do a 'git pull --log --no-ff' for all changes
that are being pulled into one of the main next/* branches, just
like torvalds does when he pulls in branches from maintainers.
Arnd
next prev parent reply other threads:[~2012-05-11 13:27 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 11:32 [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support Richard Zhao
2012-05-09 11:33 ` [PATCH V2 01/11] dma: imx-sdma: make channel0 operations atomic Richard Zhao
2012-05-10 3:53 ` Vinod Koul
2012-05-10 6:34 ` Shawn Guo
2012-05-10 12:37 ` Shawn Guo
2012-05-11 2:52 ` Vinod Koul
2012-05-11 3:02 ` Shawn Guo
2012-05-11 6:32 ` Vinod Koul
2012-05-11 7:14 ` [PATCH Rebase 1/1] " Richard Zhao
2012-05-11 8:33 ` [alsa-devel] " Vinod Koul
2012-05-09 11:33 ` [PATCH V2 02/11] ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support Richard Zhao
2012-05-10 6:20 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 03/11] ASoC: imx-audmux: add " Richard Zhao
2012-05-09 16:00 ` Mark Brown
2012-05-10 0:35 ` Richard Zhao
2012-05-10 6:39 ` Shawn Guo
2012-05-10 8:44 ` Mark Brown
2012-05-10 9:05 ` Richard Zhao
2012-05-10 9:27 ` Mark Brown
2012-05-10 10:23 ` Richard Zhao
2012-05-10 12:26 ` Linus Walleij
2012-05-10 13:41 ` Richard Zhao
2012-05-10 14:00 ` Linus Walleij
2012-05-11 5:32 ` Shawn Guo
2012-05-11 12:29 ` Linus Walleij
2012-05-11 13:27 ` Arnd Bergmann [this message]
2012-05-10 15:48 ` [alsa-devel] " Stephen Warren
2012-05-10 9:07 ` Shawn Guo
2012-05-10 9:25 ` Mark Brown
2012-05-10 12:32 ` Shawn Guo
2012-05-10 12:20 ` Linus Walleij
2012-05-10 3:28 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 04/11] ARM: dts: imx6q-sabrelite: add audmux " Richard Zhao
2012-05-10 3:29 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 05/11] ARM: imx6q: add ssi1_ipg clk_lookup Richard Zhao
2012-05-09 11:33 ` [PATCH V2 06/11] ASoC: fsl_ssi: convert to use devm_clk_get Richard Zhao
2012-05-09 11:50 ` Mark Brown
2012-05-09 11:59 ` Shawn Guo
2012-05-09 12:01 ` Mark Brown
2012-05-09 12:03 ` Shawn Guo
2012-05-09 16:09 ` Timur Tabi
2012-05-09 11:33 ` [PATCH V2 07/11] ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 Richard Zhao
2012-05-09 11:33 ` [PATCH V2 08/11] ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000 Richard Zhao
2012-05-10 6:48 ` Shawn Guo
2012-05-10 9:34 ` Richard Zhao
2012-05-10 9:41 ` Shawn Guo
2012-05-10 9:45 ` Mark Brown
2012-05-10 10:18 ` Richard Zhao
2012-05-10 11:49 ` Shawn Guo
2012-05-10 15:48 ` [alsa-devel] " Shawn Guo
2012-05-10 9:45 ` Shawn Guo
2012-05-09 11:33 ` [PATCH V2 09/11] ARM: dts: imx6q-sabrelite: add serial2 pinctrl support Richard Zhao
2012-05-10 3:33 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 10/11] ARM: imx6q: change clkdev device name from xxxx.uart to xxxx.serial Richard Zhao
2012-05-10 6:51 ` Shawn Guo
2012-05-09 11:33 ` [PATCH V2 11/11] ARM: imx6q: change clkdev device name from xxxx.enet to xxxx.ethernet Richard Zhao
2012-05-11 6:30 ` [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support Shawn Guo
2012-05-21 12:59 ` Richard Zhao
2012-05-21 14:45 ` Mark Brown
2012-05-22 1:39 ` Richard Zhao
2012-05-22 9:56 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201205111327.42883.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox