Hi,
I am using Slackware 10.1. The default kernel is 2.6.10. Slackware gives the unmodified kernel source along with the Source CDs. I installed kernel source 2.6.10. Then I downloaded the patch for kernel 2.6.11 from kernel.org and successfully applied it.
After that I apply patch 2.6.11.1 which also got applied, but after that patch 2.6.11.2 gives me error. I tried it many times and checked that I am not making any mistakes, but every time 2.6.11.2 gives me error.
When trying to apply patch-2.6.11.2, I get the following error. (I have tried with both the patch kernel script, as well as using the patch command directly, both with same result),
root@localhost:~/linux-2.6.10# ./scripts/patch-kernel . . patch-2.6.11.2.bz2 Current kernel version is 2.6.11.1 (Woozy Numbat) Applying patch-2.6.11.2 (bzip2)... 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej Reversed (or previously applied) patch detected! Skipping patch. 3 out of 3 hunks ignored -- saving rejects to file drivers/input/serio/i8042-x86ia64io.h.rej Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file drivers/md/raid6altivec.uc.rej failed. Clean up yourself.
Now as per the message if this file contains patch file "2.6.11.2" has contents which are already applied then the next file "patch 2.6.11.3 " should at least successfully apply. I tried to jump to 2.6.11.3, but of course that also gives me error.
After applying patch 2.6.11.1 the top level Makefile in the source directory says,
VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 11 EXTRAVERSION = .1 NAME=Woozy Numbat
Now if we have look at the patch file 2.6.11.2, then it says,
diff -Nru a/Makefile b/Makefile --- a/Makefile 2005-03-12 21:16:32 -08:00 +++ b/Makefile 2005-03-12 21:16:32 -08:00 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 11 -EXTRAVERSION = +EXTRAVERSION = .2 NAME=Woozy Numbat
<snip>
Now shouldn't the " -EXTRAVERSION" say ".1" ? In fact, none of the patch file in 2.6.11.x says "-EXTRAVERSION=x". All of them are empty. But the subsequent "+EXTRAVERSION=x" is present in all patch files.
I am really confused. What I did next was delete the whole source directory. Re-copied the source directory, applied the 2.6.11 patch (which gets applied successfully, in any case). Then instead of applying any other 2.6.11.x patches, I directly tried to apply 2.6.12 patch and it got applied without any errors on the screen. Now I am not sure whether I have done the correct thing or not. Secondly, I still can't figure out why am I not able to apply any patch in the 2.6.11.x series subsequent to 2.6.11.1 ? What am I doing wrong ?
The Documentation directory along with the source does not contain any instruction/suggestions to apply extraversion level patches.
I hope I have been able to explain things correctly.
Regards, Rajen.
-- ... God must love the Common Man; He made so many of them.
Hi Rajen,
On Wed, 2005-06-29 at 23:36, Rajen M. Parekh wrote:
Hi, When trying to apply patch-2.6.11.2, I get the following error. (I have tried with both the patch kernel script, as well as using the patch command directly, both with same result),
root@localhost:~/linux-2.6.10# ./scripts/patch-kernel . . patch-2.6.11.2.bz2 Current kernel version is 2.6.11.1 (Woozy Numbat) Applying patch-2.6.11.2 (bzip2)... 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej Reversed (or previously applied) patch detected! Skipping patch.
After applying patch 2.6.11.1 the top level Makefile in the source directory says,
VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 11 EXTRAVERSION = .1 NAME=Woozy Numbat Now if we have look at the patch file 2.6.11.2, then it says,
diff -Nru a/Makefile b/Makefile --- a/Makefile 2005-03-12 21:16:32 -08:00 +++ b/Makefile 2005-03-12 21:16:32 -08:00 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 11 -EXTRAVERSION = +EXTRAVERSION = .2 NAME=Woozy Numbat
<snip>
It seems that .x version are not incremental in nature. What does it mean is that you can/should directly apply the last patch without applying other patched. It also means that .2 patch contains all the changes in .1 + more changes, .3 patch contains all the changes in .1, .2 + more, etc.
This is just a guess. U can try it for yourself and prove right or wrong.
Same way 2.6.11 to 2.6.12 patch will not require .x patches to be applied at all.
Now shouldn't the " -EXTRAVERSION" say ".1" ? In fact, none of the patch file in 2.6.11.x says "-EXTRAVERSION=x". All of them are empty. But the subsequent "+EXTRAVERSION=x" is present in all patch files.
Regards, Rajen.
Please let us know if my guest is correct. With regards,