From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Warren <swarren@wwwdotorg.org>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lrg@ti.com>
Subject: Re: [PATCH 2/2] ASoC: tegra: complete Tegra->Tegra20 renaming
Date: Fri, 6 Apr 2012 16:46:24 +0100 [thread overview]
Message-ID: <20120406154624.GF19424@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <4F7F0F50.8070205@wwwdotorg.org>
[-- Attachment #1.1: Type: text/plain, Size: 599 bytes --]
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.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
prev parent reply other threads:[~2012-04-06 15:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-05 21:54 [PATCH 1/2] ASoC: tegra: rename Tegra20-specific driver files Stephen Warren
[not found] ` <1333662894-22672-2-git-send-email-swarren@wwwdotorg.org>
2012-04-06 13:18 ` [PATCH 2/2] ASoC: tegra: complete Tegra->Tegra20 renaming Mark Brown
2012-04-06 13:23 ` Mark Brown
2012-04-06 15:44 ` Stephen Warren
2012-04-06 15:46 ` Mark Brown [this message]
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=20120406154624.GF19424@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=lrg@ti.com \
--cc=swarren@wwwdotorg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.