public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: krzk@kernel.org (Krzysztof Kozlowski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from each other
Date: Tue, 3 Jan 2017 18:41:16 +0200	[thread overview]
Message-ID: <20170103164116.qkvpwvm27gdefvhy@kozik-lap> (raw)
In-Reply-To: <20170103102548.73jg6qddlcthe2mu@gangnam.samsung>

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

  parent reply	other threads:[~2017-01-03 16:41 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20170103075733epcas5p48985c789a816f1f2eae84c52e070cc14@epcas5p4.samsung.com>
2017-01-03  7:57 ` [PATCH 0/4] Add touch key driver support for TM2 Jaechul Lee
2017-01-03  7:57   ` [PATCH 1/4] input: Add support for the tm2 touchkey device driver Jaechul Lee
2017-01-03 12:26     ` Javier Martinez Canillas
2017-01-04 14:15     ` Rob Herring
2017-01-03  7:57   ` [PATCH 2/4] input: tm2-touchkey: Add touchkey driver support for TM2 Jaechul Lee
2017-01-03 13:11     ` Javier Martinez Canillas
2017-01-03 18:56       ` Dmitry Torokhov
2017-01-03 16:59     ` Krzysztof Kozlowski
2017-01-03  7:57   ` [PATCH 3/4] arm64: dts: exynos: make tm2 and tm2e independent from each other Jaechul Lee
2017-01-03  8:16     ` Andi Shyti
2017-01-03  8:27     ` Krzysztof Kozlowski
2017-01-03  9:58       ` Andi Shyti
2017-01-03 10:01         ` Krzysztof Kozlowski
2017-01-03 10:25           ` Andi Shyti
2017-01-03 11:47             ` Chanwoo Choi
2017-01-03 11:55               ` Andi Shyti
2017-01-03 12:15                 ` Javier Martinez Canillas
2017-01-03 14:40                   ` Andi Shyti
2017-01-03 14:57                     ` Javier Martinez Canillas
2017-01-03 15:29                     ` Chanwoo Choi
2017-01-03 16:31                       ` Krzysztof Kozlowski
2017-01-03 16:41             ` Krzysztof Kozlowski [this message]
2017-01-03  7:57   ` [PATCH 4/4] arm64: dts: exynos: Add tm2 touchkey node Jaechul Lee
2017-01-03 13:14     ` Javier Martinez Canillas
2017-01-03 16:49     ` Krzysztof Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170103164116.qkvpwvm27gdefvhy@kozik-lap \
    --to=krzk@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox