From 5b1f9ece1b15018634190c03eba129effa03909b Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Mon, 2 Apr 2012 00:53:29 +0000 Subject: [PATCH] --- yaml --- r: 305112 b: refs/heads/master c: 7f65e924c0cfe0896e31ce3e162b4d10df87ccfe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/README | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index fb4134af220b..96a64b6d4da4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c072c3f0e14f7ae3172771e98e24e2e0741e5daa +refs/heads/master: 7f65e924c0cfe0896e31ce3e162b4d10df87ccfe diff --git a/trunk/README b/trunk/README index 50aa430995b3..7333d2b58110 100644 --- a/trunk/README +++ b/trunk/README @@ -94,8 +94,12 @@ INSTALLING the kernel source: Unlike patches for the 3.x kernels, patches for the 3.x.y kernels (also known as the -stable kernels) are not incremental but instead apply - directly to the base 3.x kernel. Please read - Documentation/applying-patches.txt for more information. + directly to the base 3.x kernel. For example, if your base kernel is 3.0 + and you want to apply the 3.0.3 patch, you must not first apply the 3.0.1 + and 3.0.2 patches. Similarly, if you are running kernel version 3.0.2 and + want to jump to 3.0.3, you must first reverse the 3.0.2 patch (that is, + patch -R) _before_ applying the 3.0.3 patch. You can read more on this in + Documentation/applying-patches.txt Alternatively, the script patch-kernel can be used to automate this process. It determines the current kernel version and applies any @@ -107,17 +111,6 @@ INSTALLING the kernel source: kernel source. Patches are applied from the current directory, but an alternative directory can be specified as the second argument. - - If you are upgrading between releases using the stable series patches - (for example, patch-3.x.y), note that these "dot-releases" are - not incremental and must be applied to the 3.x base tree. For - example, if your base kernel is 3.0 and you want to apply the - 3.0.3 patch, you do not and indeed must not first apply the - 3.0.1 and 3.0.2 patches. Similarly, if you are running kernel - version 3.0.2 and want to jump to 3.0.3, you must first - reverse the 3.0.2 patch (that is, patch -R) _before_ applying - the 3.0.3 patch. - You can read more on this in Documentation/applying-patches.txt - - Make sure you have no stale .o files and dependencies lying around: cd linux