Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1549952

Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from each other

Show all headers | View raw

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@samsung.com>
> > >> > Signed-off-by: Jaechul Lee <jcsing.lee@samsung.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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] Add touch key driver support for TM2 Jaechul Lee <jcsing.lee@samsung.com> - 2017-01-03 09:00 +0100
  [PATCH 2/4] input: tm2-touchkey: Add touchkey driver support for TM2 Jaechul Lee <jcsing.lee@samsung.com> - 2017-01-03 09:00 +0100
    Re: [PATCH 2/4] input: tm2-touchkey: Add touchkey driver support for  TM2 Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-03 14:20 +0100
      Re: [PATCH 2/4] input: tm2-touchkey: Add touchkey driver support for  TM2 Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-03 20:00 +0100
    Re: [PATCH 2/4] input: tm2-touchkey: Add touchkey driver support for  TM2 Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-03 18:10 +0100
  Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from  each other Andi Shyti <andi.shyti@samsung.com> - 2017-01-03 09:20 +0100
  Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-03 09:30 +0100
    Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from  each other Andi Shyti <andi.shyti@samsung.com> - 2017-01-03 11:00 +0100
      Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Chanwoo Choi <cwchoi00@gmail.com> - 2017-01-03 12:50 +0100
        Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from  each other Andi Shyti <andi.shyti@samsung.com> - 2017-01-03 13:00 +0100
          Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-03 13:20 +0100
            Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Andi Shyti <andi@etezian.org> - 2017-01-03 15:50 +0100
              Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Javier Martinez Canillas <javier@osg.samsung.com> - 2017-01-03 16:10 +0100
              Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Chanwoo Choi <cwchoi00@gmail.com> - 2017-01-03 17:10 +0100
                Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-03 18:00 +0100
      Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from  each other Andi Shyti <andi.shyti@samsung.com> - 2017-01-03 11:30 +0100
        Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-03 17:50 +0100
      Re: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent  from each other Krzysztof Kozlowski <krzk@kernel.org> - 2017-01-03 11:10 +0100

csiph-web