linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@baker-net.org.uk (Adam Baker)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common
Date: Tue, 08 Apr 2014 22:43:10 +0100	[thread overview]
Message-ID: <53446D6E.7070909@baker-net.org.uk> (raw)
In-Reply-To: <20140408192625.GD29372@lunn.ch>

On 08/04/14 20:26, Andrew Lunn wrote:
> On Sun, Apr 06, 2014 at 10:42:49PM +0100, Adam Baker wrote:
>>   Rename the include file kirkwood-nsa310-common.dtsi as
>>   it is now also used for NSA320. There is also an NSA325
>>   but that appears not to be as similar so is unlikely to
>>   want to share an include file.
>>
>> Signed-off-by: Adam Baker <linux@baker-net.org.uk>
>> ---
>>   arch/arm/boot/dts/kirkwood-nsa310-common.dtsi |  157 -------------------------
> ...
>>   arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi |  157 +++++++++++++++++++++++++
>>   5 files changed, 160 insertions(+), 160 deletions(-)
>>   delete mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
>>   create mode 100644 arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
>
>
> Hi Adam
>
> git should be able to do that as a straight rename, rather than two
> big patch hunks, removing and adding. Try using git mv.
>
> Jason: Are you O.K. with it like this? Or do you want a new minimal
> patch?
>

I did originally perform the rename using git mv but according to 
gitref.org "although the git mv command exists, it is superfluous - all 
it does is a git rm --cached, moves the file on disk, then runs a git 
add on the new file.". Is this something that works better in recent git 
versions, I'm running on Debian stable which uses 1.7.10.4

Adam

  parent reply	other threads:[~2014-04-08 21:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-06 21:37 [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Adam Baker
2014-04-06 21:42 ` [PATCH 1/3] ARM: kirkwood: Move NSA310 common parts to include file Adam Baker
2014-04-06 21:42   ` [PATCH 2/3] ARM: kirkwood: Add DTS file for NSA320 Adam Baker
2014-04-06 21:42   ` [PATCH 3/3] ARM: kirkwood: rename kirwood-nsa310-common to 3x0-common Adam Baker
2014-04-08 19:26     ` Andrew Lunn
2014-04-08 21:26       ` Jason Cooper
2014-04-08 21:43       ` Adam Baker [this message]
2014-04-08 22:34         ` [PATCH v2 " Adam Baker
2014-04-08 19:27 ` [PATCH 0/3] ARM: kirkwood: Add device tree for NSA320 Andrew Lunn
2014-04-24  4:44 ` Jason Cooper

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=53446D6E.7070909@baker-net.org.uk \
    --to=linux@baker-net.org.uk \
    --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;
as well as URLs for NNTP newsgroup(s).