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

[Lee Jones]

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

Well I'm sure we'd sort out any conflicts.

Go ahead and apply it to your tree with my Ack then.

In future, let's do the immutable branch thing, it's worked well thus
far.

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