From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Vrabel Subject: Re: [PATCH] arm: fixup hard tabs Date: Mon, 13 Feb 2012 18:26:33 +0000 Message-ID: <4F3955D9.2020900@citrix.com> References: <63e88a26e1ef58c8e5a2.1329156229@cosworth.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <63e88a26e1ef58c8e5a2.1329156229@cosworth.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Campbell Cc: tim@xen.org, xen-devel@lists.xensource.com, stefano.stabellini@citrix.com, david.vrabel@citrix.com List-Id: xen-devel@lists.xenproject.org On 13/02/12 18:03, Ian Campbell wrote: > # HG changeset patch > # User Ian Campbell > # Date 1329153968 0 > # Node ID 63e88a26e1ef58c8e5a2b30a003ab7c3bc9c6b54 > # Parent 7fd8f10cfd3eaf9f0982eb6fd49334a1e229ba98 > arm: fixup hard tabs > > Unfortunately the tool I was using to apply patches mangles hard tabs. This > patch corrects this in the effected files (which is fortunately only a subset > of .S or files imported from Linux) No other file in the tree has tabs why should these? Nak, unless your intention is to immediately apply a patch converting tabs to 8 spaces. Interestingly, the citrix email server apears to mangle tabs and replace them with spaces (which made the copy of these patch I received via Cc appear to do nothing at all). Perhaps this is where it went wrong originally? > "git diff" and "git diff -b" vs. Stefano's v6 branch now contain the same > output -- i.e. only the intervening development I don't think this is particularly useful long term. > Signed-off-by: Ian Campbell > > diff -r 7fd8f10cfd3e -r 63e88a26e1ef xen/arch/arm/dtb.S > --- a/xen/arch/arm/dtb.S Mon Feb 13 17:03:44 2012 +0000 > +++ b/xen/arch/arm/dtb.S Mon Feb 13 17:26:08 2012 +0000 > @@ -1,2 +1,2 @@ > - .section .dtb,#alloc > - .incbin CONFIG_DTB_FILE > + .section .dtb,#alloc > + .incbin CONFIG_DTB_FILE This was a new file that never had tabs anywhere. No need to mess about with it. > diff -r 7fd8f10cfd3e -r 63e88a26e1ef xen/arch/arm/entry.S > --- a/xen/arch/arm/entry.S Mon Feb 13 17:03:44 2012 +0000 > +++ b/xen/arch/arm/entry.S Mon Feb 13 17:26:08 2012 +0000 [... > -#define SAVE_ALL \ > - sub sp, #(UREGS_R8_fiq - UREGS_sp); /* SP, LR, SPSR, PC */ \ > - push {r0-r12}; /* Save R0-R12 */ \ > - \ > - mrs r11, ELR_hyp; /* ELR_hyp is return address. */ \ While your messing with whitespace. How about moving that \ to below 80 columns. David