Re: [Patch v4 9/9] arm64: Update device tree for Layerscape SoCs

Shawn Guo
2016-08-29T08:34:16Z

On Mon, Aug 29, 2016 at 10:05:30AM +0200, Borislav Petkov wrote:
> On Mon, Aug 29, 2016 at 02:34:48PM +0800, Shawn Guo wrote:
> > Is it mandatory to have DTS changes go with driver part altogether?
>
> Yes, because the EDAC driver needs them to even load properly.

When separate branches get merged on Linus tree, it works anyway.

>
> > Otherwise, I prefer to have them go through separate tree.
>
> Any particular reason why you prefer that?

To avoid potential merge conflicts. Unless there are hard dependencies
like making it compile, avoiding regression or maintaining bisect,
patches should go through their established subsystem/architecture tree.

> We've been doing this for other ARM EDAC drivers already and there were
> no issues whatsoever.

Luckily. If there are many patches on architecture DT branch changing
the same file, when driver branch and DT branch merges in upstream
branch, there will likely be merge conflicts.

Shawn