Re: [2.6 patch] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI

[Adrian Bunk]

On Mon, Jul 02, 2007 at 08:36:48PM -0400, Dave Jones wrote:
> On Tue, Jul 03, 2007 at 01:43:13AM +0200, Adrian Bunk wrote:
>  > > Applying '[CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI'
>  > > 
>  > > error: patch failed: arch/x86_64/kernel/cpufreq/Kconfig:65
>  > > error: arch/x86_64/kernel/cpufreq/Kconfig: patch does not apply
>  > 
>  > I made the patch against 2.6.22-rc6-mm1 (based on an older version of 
>  > this patch)  but I missed the fuzz (and GNU patch defaults to accept
>  > patches with a fuzz of 2).
>  > 
>  > Below is a version of the patch with the fuzz edited out.
> 
> It also has the context edited out :)

That's what I said.

>  > @@ -65,1 +60,1 @@
>  > -	depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI
>  > +	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
>  > --- linux-2.6.20-mm1/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c.old	2007-02-17 23:29:53.000000000 +0100
>  > +++ linux-2.6.20-mm1/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	2007-02-17 23:30:44.000000000 +0100
> 
> This won't apply either.

  git-apply --unidiff-zero

git-apply defaulting to reject valid patches that are purposefully 
without context is IMHO plain silly. I'll ask the git maintainers to
change this.

> 	Dave

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
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/