LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Dave Jones <davej@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	cpufreq@lists.linux.org.uk, linux-kernel@vger.kernel.org,
	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>,
	lenb@kernel.org, linux-acpi@vger.kernel.org
Subject: Re: [2.6 patch] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI
Date: Tue, 3 Jul 2007 03:06:11 +0200	[thread overview]
Message-ID: <20070703010611.GD3492@stusta.de> (raw)
In-Reply-To: <20070703003648.GA31035@redhat.com>

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


  reply	other threads:[~2007-07-03  1:05 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-01 20:20 Adrian Bunk
2007-07-02 23:22 ` Dave Jones
2007-07-02 23:43   ` Adrian Bunk
2007-07-03  0:36     ` Dave Jones
2007-07-03  1:06       ` Adrian Bunk [this message]
2007-07-03  1:13         ` Dave Jones
2007-07-08 21:39           ` Adrian Bunk
  -- strict thread matches above, loose matches on Subject: below --
2007-04-06 10:19 Adrian Bunk
2007-04-06 10:29 ` Dave Jones
2007-04-06 10:38   ` Robert P. J. Day
2007-04-06 10:46     ` Dave Jones
2007-02-20  0:06 Adrian Bunk
2007-02-24 14:20 ` Pallipadi, Venkatesh
2007-04-06 22:30 ` Bill Davidsen
2007-04-06 22:38   ` Adrian Bunk

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=20070703010611.GD3492@stusta.de \
    --to=bunk@stusta.de \
    --cc=akpm@linux-foundation.org \
    --cc=cpufreq@lists.linux.org.uk \
    --cc=davej@redhat.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=venkatesh.pallipadi@intel.com \
    --subject='Re: [2.6 patch] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI' \
    /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

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).