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

[Lee Jones]

On Wed, 27 Nov 2013, Mark Brown wrote:

> On Wed, Nov 27, 2013 at 03:27:01PM +0000, Lee Jones wrote:
> > On Wed, 27 Nov 2013, Mark Brown wrote:
> 
> > > That seems excessive and it probably ought to go in as a bug fix
> > > afterwards.  Given that it's just an addition of data to the table I'd
> > > expect we could cope, we've routinely done that with similar updates in
> > > the past without incident.
> 
> > Ah, is the depends patch in Mainline already? I assumed it was due to
> > go in during the v3.14 merge window? If it's already in Mainline, then
> > sure I don't mind if it goes in -fixes via ASoC, no problem.
> 
> No, it's for v3.14 - it just seemed like for the size/impact of the
> change we should be able to handle the situation more smoothly.

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
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.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/