On Thu, May 10, 2012 at 09:44:04AM +0100, Mark Brown wrote: > On Thu, May 10, 2012 at 02:39:06PM +0800, Shawn Guo wrote: > > On Thu, May 10, 2012 at 08:35:33AM +0800, Richard Zhao wrote: > > > > It's based on your for-next. But for working, it depends on > > > pinctl/for-next. > > > Mark, may I have your ack to have it go through arm-soc? I will ask > > Arnd pull your sound/for-v3.5 branch into arm-soc as a dependency. > > You need to ensure the branch will not be rebased. > > for-3.5 is the entire undifferentiated blob of ASoC stuff, it's not > really suitable for merging elsewhere. It won't actually get rebased > but the idea of merging it into other trees doesn't seem terribly > clever, it'd make having topic branches in arm-soc a bit of a joke and > if you pull it right now you'll get problems in -next due to the the > ux500 stuff. > > What does "working" mean in this context - what happens without the > pinctl changes? devm_pinctrl_get_select_default function is added in below commit which is in pinctrl/for-next. commit 6d4ca1fb467932773da7b808c52f3d7ef4461ba0 Author: Stephen Warren <swarren@xxxxxxxxxx> Date: Mon Apr 16 10:51:00 2012 -0600 pinctrl: implement devm_pinctrl_get()/put() These functions allow the driver core to automatically clean up any allocations made by drivers, thus leading to simplified drivers. Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> So it'll fail compile without pinctrl/for-next. I guess Linus may need to prepare a non-rebase base for others to merge. Thanks Richard -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html