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,