[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170103164116.qkvpwvm27gdefvhy@kozik-lap>
Date: Tue, 3 Jan 2017 18:41:16 +0200
From: Krzysztof Kozlowski <krzk@...nel.org>
To: Andi Shyti <andi.shyti@...sung.com>
Cc: Krzysztof Kozlowski <krzk@...nel.org>,
Jaechul Lee <jcsing.lee@...sung.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Rob Herring <robh+dt@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will.deacon@....com>,
Kukjin Kim <kgene@...nel.org>,
Javier Martinez Canillas <javier@....samsung.com>,
Chanwoo Choi <cw00.choi@...sung.com>, beomho.seo@...sung.com,
galaxyra@...il.com, linux-arm-kernel@...ts.infradead.org,
linux-input@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-samsung-soc@...r.kernel.org
Subject: Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent
from each other
On Tue, Jan 03, 2017 at 07:25:48PM +0900, Andi Shyti wrote:
> > >> > Currently tm2e dts includes tm2 but there are some differences
> > >> > between the two boards and tm2 has some properties that tm2e
> > >> > doesn't have.
> > >> >
> > >> > That's why it's important to keep the two dts files independent
> > >> > and put all the commonalities in a tm2-common.dtsi file.
> > >> >
> > >> > Signed-off-by: Andi Shyti <andi.shyti@...sung.com>
> > >> > Signed-off-by: Jaechul Lee <jcsing.lee@...sung.com>
> > >> > ---
> > >> > .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1046 ++++++++++++++++++++
> > >> > arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1033 +------------------
> > >> > arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 2 +-
> > >> > 3 files changed, 1049 insertions(+), 1032 deletions(-)
> > >> > create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
> > >>
> > >> I would like to see here the rename and diff from it. Not entire delta
> > >> (deletions and addons). It is not possible to compare it... I think
> > >> git supports it by default with similarity of 50%.
> > >
> > > I understand, it's indeed quite cryptic to understand. But all
> > > the diff algorithms (patience, minimal, histogram, myers) give
> > > the same result. I don't know how to make it better.
> > >
> > > I could split this patch, but this also means breaking tm2's
> > > functionality, which looks worse.
> > >
> > > Please tell me if you know a better way for generating the patch.
> >
> > git format-patch -M95%?
>
> Same thing with all M values.
>
> Because exynos5433-tm2.dts results modified, while
> exynos5433-tm2-common.dtsi is new. Even though I did:
>
> 1. mv exynos5433-tm2.dts exynos5433-tm2-common.dtsi
> 2. copied pieces from exynos5433-tm2-common.dtsi to a new
> exynos5433-tm2.dts
mv/etc won't help. You need to convince git format-patch that it is
rename. For that, you need -B so copy will be considered a rename
(otherwise rename will be detected only if a file is removed), so:
git format-patch -B50% -1
Please resend with this approach.
Best regards,
Krzysztof
Powered by blists - more mailing lists