All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Warren <swarren@nvidia.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Colin Cross <ccross@google.com>
Cc: "linux-tegra@vger.kernel.org" <linux-tegra@vger.kernel.org>,
	"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
	"lrg@slimlogic.co.uk" <lrg@slimlogic.co.uk>
Subject: Re: [PATCH v3 2/4] ARM: tegra: Add Harmony sound platform data type
Date: Fri, 21 Jan 2011 15:49:10 -0800	[thread overview]
Message-ID: <74CDBE0F657A3D45AFBB94109FB122FF0310955A2F@HQMAIL01.nvidia.com> (raw)
In-Reply-To: <20110121234140.GA20247@opensource.wolfsonmicro.com>

Mark Brown wrote on Sent: Friday, January 21, 2011 4:42 PM:
>
> On Fri, Jan 21, 2011 at 02:41:08PM -0800, Colin Cross wrote:
> 
> > Could the same platform_data patch go into both ASoC and Tegra?  It
> > would fall out in the merge, no matter who gets pulled first.  If we
> > go that route, whichever place you put the header, one of the trees
> > will have an include file that is in the other tree's directory.
> 
> The usual thing here would be a branch that gets merged into both trees
> (to avoid the commit getting duplicated) or to only apply in one tree and
> let things sort themselves out in -next and the merge window.

Ah yes, I do remember you mentioning that before. Now I realize exactly
what you mean.

I'm quite happy to create a branch for this, cherry-pick my change onto it,
and tell you where it is, so you can merge from it.

What should I base the branch off; since it's a simple file add, I guess
the current mainline tree would be fine.

I assume there are no specific requirements for where the branch is hosted;
i.e. something you can git clone over HTTP from my personal server would
be fine?

Thanks!

-- 
nvpublic

  reply	other threads:[~2011-01-21 23:49 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1295393859-3396-1-git-send-email-swarren@wwwdotorg.org>
     [not found] ` <1295393859-3396-2-git-send-email-swarren@wwwdotorg.org>
2011-01-19  0:21   ` [PATCH 1/3] ASoC: WM8903: Add wm8903_set_gpio Mark Brown
2011-01-19  0:25 ` [PATCH 0/3] Tegra: Add internal speaker support Mark Brown
2011-01-19  0:29   ` Stephen Warren
     [not found]     ` <AANLkTi=m585PZum2NQUOqq1PiqP84LuT-qCruzaO7x7t@mail.gmail.com>
2011-01-19 11:30       ` Mark Brown
2011-01-19 12:47 ` Liam Girdwood
2011-01-19 20:50 ` [PATCH v2 0/4] Tegra: Harmony: " Stephen Warren
2011-01-20 10:04   ` Liam Girdwood
2011-01-19 20:50 ` [PATCH v2 1/4] ASoC: WM8903: Expose GPIOs through gpiolib Stephen Warren
2011-01-20 11:53   ` Mark Brown
2011-01-20 17:23     ` Stephen Warren
2011-01-20 20:33       ` Mark Brown
2011-01-19 20:50 ` [PATCH v2 2/4] ARM: tegra: Add Harmony sound platform data type Stephen Warren
2011-01-19 20:50 ` [PATCH v2 3/4] ARM: tegra: Platform data fixes for ASoC driver updates Stephen Warren
2011-01-19 20:50 ` [PATCH v2 4/4] ASoC: tegra: Harmony: Support the internal speaker Stephen Warren
2011-01-20 11:58   ` Mark Brown
2011-01-25 20:29   ` Mark Brown
2011-01-26  3:46     ` Stephen Warren
2011-01-26 11:00       ` Mark Brown
2011-01-20 20:52 ` [PATCH v3 0/4] Tegra: Harmony: Add internal speaker support Stephen Warren
2011-01-20 20:52 ` [PATCH v3 1/4] ASoC: WM8903: Expose GPIOs through gpiolib Stephen Warren
2011-01-21 12:05   ` Mark Brown
2011-01-20 20:52 ` [PATCH v3 2/4] ARM: tegra: Add Harmony sound platform data type Stephen Warren
2011-01-21 18:43   ` Colin Cross
2011-01-21 22:35     ` Stephen Warren
2011-01-21 22:41       ` Colin Cross
2011-01-21 23:41         ` Mark Brown
2011-01-21 23:49           ` Stephen Warren [this message]
2011-01-22  5:14             ` Olof Johansson
2011-01-22  5:34               ` Stephen Warren
2011-01-22  5:40                 ` Olof Johansson
2011-01-20 20:52 ` [PATCH v3 3/4] ARM: tegra: Platform data fixes for ASoC driver updates Stephen Warren
2011-01-20 21:22   ` Mark Brown
2011-01-20 22:15     ` Liam Girdwood
2011-01-21 17:45     ` Stephen Warren
2011-01-21 17:50       ` Mark Brown
2011-01-21 18:06         ` Stephen Warren
2011-01-21 18:11           ` Mark Brown
2011-01-21 18:22             ` Stephen Warren
2011-01-21 18:27               ` Mark Brown
2011-01-21 18:36                 ` Stephen Warren
2011-01-21 18:39                   ` Mark Brown
2011-01-21 18:51                     ` Stephen Warren
2011-01-21 18:57                       ` Mark Brown
2011-01-21 22:41                         ` Stephen Warren
2011-01-20 20:52 ` [PATCH v3 4/4] ASoC: tegra: Harmony: Support the internal speaker Stephen Warren

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=74CDBE0F657A3D45AFBB94109FB122FF0310955A2F@HQMAIL01.nvidia.com \
    --to=swarren@nvidia.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=ccross@google.com \
    --cc=linux-tegra@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    /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.