Re: git/cscope with x86 merge

[Sam Ravnborg]

On Sat, Oct 20, 2007 at 08:56:18AM -0700, Linus Torvalds wrote:
> 
> 
> On Sat, 20 Oct 2007, Yinghai Lu wrote:
> > 
> > git log -p --follow arch/x86/kernel/vmlinux_64.lds.S
> > 
> > can not trace to arch/x86_64/kernel/vmlinux.lds.S
> 
> Hmm. I get:
> 
> 	[torvalds@woody linux]$ git log --stat --follow arch/x86/kernel/vmlinux_64.lds.S
> 	commit 250c22777fe1ccd7ac588579a6c16db4c0161cc5
> 	Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 	Date:   Thu Oct 11 11:17:24 2007 +0200
> 	
> 	    x86_64: move kernel
> 	
> 	    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 	    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> 	
> 	 arch/{x86_64 => x86}/kernel/vmlinux_64.lds.S |    0
> 	 1 files changed, 0 insertions(+), 0 deletions(-)
> 	
> 	commit 13a9cd42466e12113859c4d7b41561e8bbcaf09d
> 	Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 	Date:   Thu Oct 11 11:14:21 2007 +0200
> 	
> 	    x86_64: prepare shared kernel/vmlinux.lds.S
> 	
> 	    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 	    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> 	
> 	 arch/x86_64/kernel/vmlinux_64.lds.S |  235 +++++++++++++++++++++++++++++++++++
> 	 1 files changed, 235 insertions(+), 0 deletions(-)
> 
> 
> so it definitely works for me.

But you do not see the rename arch/x86_64/kernel/{vmlinux.lds.S => vmlinux.lds.S}
And this is I thing the important step here.

For vmlinux.lds.S we have two renames.
First the vmlinux.lds.S => vmlinux_64.lds.S
But this may be a copy instead of a rename thus preventing us
to see the old history of vmlinux.lds.S?

	Sam
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/