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

Borislav Petkov
2016-08-29T14:42:21Z

On Mon, Aug 29, 2016 at 04:33:50PM +0800, Shawn Guo wrote:
> To avoid potential merge conflicts.

Haven't heard of any so far. And I don't see how adding 1 or 2 DT
entries more per driver is a serious merge conflict.

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

Well, doh, the driver simply doesn't work. How are people even supposed
to test the EDAC tree?

Why is it even such a big deal if it is acked by the proper maintainers?
Cross-tree maintainer acking happens all the time. So don't tell me the
merge conflicts are your big issue with this.

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

So? There are tools to resolve those. And again, the DT changes for
EDAC are basically adding blocks so resolving those conflicts should be
trivial most of the time.

So no, I don't consider the potential merge conflicts an issue here.

--
Regards/Gruss,
Boris.

ECO tip #101: Trim your mails when you reply.
--