Re: [PATCH] mfd: wm5110: Give new AIF2 registers defaults and markas readable

[Mark Brown]

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: signature.asc
Description: Digital signature