From: Mark Brown <broonie@kernel.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>,
sameo@linux.intel.com, patches@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable
Date: Wed, 27 Nov 2013 18:28:41 +0000 [thread overview]
Message-ID: <20131127182841.GF14725@sirena.org.uk> (raw)
In-Reply-To: <20131127164202.GX3296@lee--X1>
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
On Wed, Nov 27, 2013 at 04:42:02PM +0000, Lee Jones wrote:
> I see. Well I'm not sure how. If we apply it to either ASoC or MFD and
> other patches pertaining to that file subsequently appear, then
> conflict is likely. As you know, the commonly used mitigation
It shouldn't be that likely, we're adding entries to the middle of big,
ordered tables - conflicts would be caused by something like changing
or adding adjacent entries and they're pretty trivial to resolve. It's
not like a restructring of the code or anything.
> technique we usually employ is immutable branches, but this was not
> employed in this case for one reason or another. So if we apply it now
> to either one of the trees we will be hedging our bets.
Hedging our bets would be applying it to both trees!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-11-27 18:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 12:51 [PATCH] mfd: wm5110: Give new AIF2 registers defaults and mark as readable Charles Keepax
2013-11-27 13:24 ` Lee Jones
2013-11-27 14:19 ` Charles Keepax
2013-11-27 15:16 ` Mark Brown
2013-11-27 15:27 ` Lee Jones
2013-11-27 16:07 ` Mark Brown
2013-11-27 16:42 ` Lee Jones
2013-11-27 18:28 ` Mark Brown [this message]
2013-11-28 8:48 ` Lee Jones
2013-11-28 10:35 ` Mark Brown
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=20131127182841.GF14725@sirena.org.uk \
--to=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=sameo@linux.intel.com \
/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