prepatching errors

prepatching errors

[David Abrahams]

Hi,

I'm trying to apply the 2.6.18-rc6 prepatch (from
http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2)
to the 2.6.17.11 sources (from
http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.11.tar.bz2) using

  patch -p1 < ~/patch-2.6.18-rc6

and I'm seeing various error messages, e.g.:

  patching file Makefile
  Hunk #1 FAILED at 1.
  1 out of 39 hunks FAILED -- saving rejects to file Makefile.rej

  ...

  patching file arch/um/kernel/time_kern.c
  Reversed (or previously applied) patch detected!  Assume -R? [n] 
  Apply anyway? [n] 
  Skipping patch.
  1 out of 1 hunk ignored -- saving rejects to file arch/um/kernel/time_kern.c.rej

Am I doing something wrong?  Is this normal?

I'm downloading the 2.6.17.11 tarball again just in case I've confused
something, but I've been untaring the raw material from a file I have
called linux-2.6.17.11.tar.bz2, so it seems unlikely.

Any advice appreciated!

Thanks,

-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com

Re: prepatching errors

[Chase Venters]

On Thu, 7 Sep 2006, David Abrahams wrote:

>
> Hi,
>
> I'm trying to apply the 2.6.18-rc6 prepatch (from
> http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2)
> to the 2.6.17.11 sources (from
> http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.11.tar.bz2) using

David,
 	The -rc series patches should be applied to the last mainline (not 
-stable) release. In your case, you want to patch 2.6.17.

Thanks,
Chase

>  patch -p1 < ~/patch-2.6.18-rc6
>
> and I'm seeing various error messages, e.g.:
>
>  patching file Makefile
>  Hunk #1 FAILED at 1.
>  1 out of 39 hunks FAILED -- saving rejects to file Makefile.rej
>
>  ...
>
>  patching file arch/um/kernel/time_kern.c
>  Reversed (or previously applied) patch detected!  Assume -R? [n]
>  Apply anyway? [n]
>  Skipping patch.
>  1 out of 1 hunk ignored -- saving rejects to file arch/um/kernel/time_kern.c.rej
>
> Am I doing something wrong?  Is this normal?
>
> I'm downloading the 2.6.17.11 tarball again just in case I've confused
> something, but I've been untaring the raw material from a file I have
> called linux-2.6.17.11.tar.bz2, so it seems unlikely.
>
> Any advice appreciated!
>
> Thanks,
>
>

Re: prepatching errors

[David Abrahams]

Chase Venters <chase.venters@clientec.com> writes:

> On Thu, 7 Sep 2006, David Abrahams wrote:
>
>>
>> Hi,
>>
>> I'm trying to apply the 2.6.18-rc6 prepatch (from
>> http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2)
>> to the 2.6.17.11 sources (from
>> http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.11.tar.bz2) using
>
> David,
> 	The -rc series patches should be applied to the last mainline (not
> -stable) release. In your case, you want to patch 2.6.17.

Oooooh!

Thanks,
-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com

Re: prepatching errors

[David Abrahams]

David Abrahams <dave@boost-consulting.com> writes:

> Chase Venters <chase.venters@clientec.com> writes:
>
>> On Thu, 7 Sep 2006, David Abrahams wrote:
>>
>>>
>>> Hi,
>>>
>>> I'm trying to apply the 2.6.18-rc6 prepatch (from
>>> http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2)
>>> to the 2.6.17.11 sources (from
>>> http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.11.tar.bz2) using
>>
>> David,
>> 	The -rc series patches should be applied to the last mainline (not
>> -stable) release. In your case, you want to patch 2.6.17.
>
> Oooooh!

BTW, it might be a good idea to put a link to the latest mainline
sources right on the front page of kernel.org where I found the
prepatch.  Along with note in the prepatch row saying "apply to 2.6.17
sources," that would have saved y'all having to answer my dumb query.

Thanks again,
-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com