From: Dave Jones <davej@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: arch merge fallout.
Date: Fri, 12 Oct 2007 14:25:04 -0400 [thread overview]
Message-ID: <20071012182504.GA9222@redhat.com> (raw)
In-Reply-To: <alpine.LFD.0.999.0710112103240.6887@woody.linux-foundation.org>
[fixed up Cc list that I dorked previously]
On Thu, Oct 11, 2007 at 09:06:42PM -0700, Linus Torvalds wrote>
> On Thu, 11 Oct 2007, Dave Jones wrote:
> >
> > I had hoped that git would be smart(tm) enough to figure out
> > that files had moved, and my changes in cpufreq.git would
> > somehow 're-route' to the right files, but it seems that
> > git isn't psychic, and gives up.
>
> Actually, git *is* psychic, and can almost certainly do it, but you need
> to help it a bit.
>
> Do a
>
> git config --global diff.renamelimit 0
>
> to tell git to not give up on just the sheer amount of renames.
>
> (The default git rename detection limit is really designed for
> smaller-memory machines)
This still gives me the same problem.
(14:21:29:davej@hera:src)$ git clone -l linus test
Initialized empty Git repository in /home/davej/src/test/.git/
0 blocks
Checking 23014 files out...
100% (23014/23014) done
(14:21:51:davej@hera:src)$ cd test/
(14:21:54:davej@hera:test)$ git config --global diff.renamelimit 0
(14:21:58:davej@hera:test)$ git pull ../cpufreqremote: Generating pack...
remote: Done counting 174 objects.
remote: Result has 116 objects.
remote: Deltifying 116 objects...
remote: 100% (116/116) done
remote: Total 116 (delta 105), reused 0 (delta 0)
Indexing 116 objects...
100% (116/116) done
Resolving 105 deltas...
100% (105/105) done
58 objects were added to complete this thin pack.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/e_powersaver.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/e_powersaver.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/elanfreq.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/elanfreq.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/gx-suspmod.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/gx-suspmod.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/longhaul.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/longhaul.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/p4-clockmod.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/p4-clockmod.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/powernow-k6.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/powernow-k6.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/powernow-k7.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/powernow-k7.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/powernow-k8.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/powernow-k8.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/sc520_freq.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/sc520_freq.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/speedstep-ich.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/speedstep-ich.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/speedstep-smi.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/speedstep-smi.c left in tree.
Auto-merged arch/powerpc/platforms/cell/cbe_cpufreq.c
Automatic merge failed; fix conflicts and then commit the result.
The git on master.kernel.org (1.5.3.4) is pretty recent, so I don't think
that's the problem, is it?
Dave
--
http://www.codemonkey.org.uk
next parent reply other threads:[~2007-10-12 18:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20071012035743.GA12897@redhat.com>
[not found] ` <alpine.LFD.0.999.0710112103240.6887@woody.linux-foundation.org>
2007-10-12 18:25 ` Dave Jones [this message]
2007-10-12 21:58 ` arch merge fallout Linus Torvalds
2007-10-12 22:12 ` Dave Jones
2007-10-12 22:43 ` Linus Torvalds
2007-10-12 22:52 ` Dave Jones
2007-10-12 23:14 ` Linus Torvalds
2007-10-13 0:11 ` Dave Jones
2007-10-13 0:25 ` Dave Jones
2007-10-13 0:32 ` Linus Torvalds
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=20071012182504.GA9222@redhat.com \
--to=davej@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.