From: Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
To: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Cc: "lrg-kDsPt+C1G03kYMGBc/C6ZA@public.gmane.org"
<lrg-kDsPt+C1G03kYMGBc/C6ZA@public.gmane.org>,
"ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org"
<ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org>,
"konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org"
<konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org>,
"olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org"
<olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
"alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org"
<alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org>,
"linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: [PATCH v2] ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903
Date: Thu, 21 Apr 2011 19:42:44 +0100 [thread overview]
Message-ID: <20110421184244.GB31850@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <74CDBE0F657A3D45AFBB94109FB122FF04973BB834-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
On Thu, Apr 21, 2011 at 09:29:30AM -0700, Stephen Warren wrote:
> It didn't matter which way around it was. However, thinking more I was
> indeed wrong, since the conflicts in the initial application were more
> complex than I'd thought through.
It's not that they were complex, it's more that if you've got a patch
which is advertised as being for a particular branch the general
expectation is that it would actually apply to that branch.
> I guess the correct solution would have been for a clean application
> to your tegra branch, then you'd be OK with the merge conflict into
> 2.6.40? I probably should have mentioned it in the patch either way.
Yes, ideally you'd also show the merge result (and possibly even publish
versions of both branches after application, especially if the merge is
tricky).
prev parent reply other threads:[~2011-04-21 18:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 16:18 [PATCH v2] ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903 Stephen Warren
[not found] ` <1303229881-9054-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-04-20 11:12 ` Liam Girdwood
2011-04-20 16:34 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04973BB629-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-04-20 16:40 ` Mark Brown
[not found] ` <20110420164022.GE9869-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-04-21 5:19 ` Olof Johansson
2011-04-21 5:19 ` Olof Johansson
2011-04-21 10:58 ` Mark Brown
[not found] ` <20110421105819.GC11788-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-04-21 16:29 ` Stephen Warren
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF04973BB834-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-04-21 18:42 ` 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=20110421184244.GB31850@opensource.wolfsonmicro.com \
--to=broonie-yzvpicuk2aatku/dhu1wvuem+bqzidxxqq4iyu8u01e@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
--cc=konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=lrg-kDsPt+C1G03kYMGBc/C6ZA@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox