Skip to contentSkip to conversation

prepatching errors

DISCUSSION David Abrahams 2 participants 4 messages Sep 8, 2006

lore
Share & tools
lore
#0 lore raw

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,

Signature · 3 lines
Dave Abrahams
Boost Consulting
www.boost-consulting.com
#1 lore raw
Quoted 7 lines · 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

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

Quoted 27 lines

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,

#2 lore raw
Quoted 5 lines · Chase Venters
Quoted 3 lines · David Abrahams

Hi,

Quoted 8 lines
Quoted 4 lines

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,

Signature · 3 lines
Dave Abrahams
Boost Consulting
www.boost-consulting.com
#3 lore raw
Quoted 12 lines · David Abrahams
Quoted 10 lines · Chase Venters
Quoted 7 lines · 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

Quoted 5 lines
Quoted 3 lines

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,

Signature · 3 lines
Dave Abrahams
Boost Consulting
www.boost-consulting.com