[alsa-devel] [PATCH 2/2] ASoC: tegra: complete Tegra->Tegra20 renaming

Mark Brown broonie at opensource.wolfsonmicro.com
Fri Apr 6 17:46:24 CEST 2012

On Fri, Apr 06, 2012 at 09:44:16AM -0600, Stephen Warren wrote:

> I'm not sure when "things have merged back up" will be; do you intend to
> merge your for-3.4 branch into for-3.5 at any particular time, or
> perhaps rebase your for-3.5 onto v3.4-rc2 when its out?

I'll merge up the commit from Linus' tree.

> Alternatively, I can regenerate that patch against your for-3.5, but
> then you'll get a merge conflict when merging in your for-3.4, since the
> code it affects will have experienced a rename. Should be trivial to
> resolve though.

If it's trivial to resolve that won't be a problem.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20120406/33f7b80a/attachment.sig 

More information about the Alsa-devel mailing list