Commit 7f65e924c0cfe0896e31ce3e162b4d10df87ccfe

Authored by Michael Witten
Committed by Jiri Kosina
1 parent c072c3f0e1

README: Consolidate discussions of -stable patches

The nature of the patches for the -stable kernels was discussed
twice; this commit consolidates those discussions into one
paragraph.

Signed-off-by: Michael Witten <mfwitten@gmail.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 1 changed file with 6 additions and 13 deletions Side-by-side Diff

... ... @@ -94,8 +94,12 @@
94 94  
95 95 Unlike patches for the 3.x kernels, patches for the 3.x.y kernels
96 96 (also known as the -stable kernels) are not incremental but instead apply
97   - directly to the base 3.x kernel. Please read
98   - Documentation/applying-patches.txt for more information.
  97 + directly to the base 3.x kernel. For example, if your base kernel is 3.0
  98 + and you want to apply the 3.0.3 patch, you must not first apply the 3.0.1
  99 + and 3.0.2 patches. Similarly, if you are running kernel version 3.0.2 and
  100 + want to jump to 3.0.3, you must first reverse the 3.0.2 patch (that is,
  101 + patch -R) _before_ applying the 3.0.3 patch. You can read more on this in
  102 + Documentation/applying-patches.txt
99 103  
100 104 Alternatively, the script patch-kernel can be used to automate this
101 105 process. It determines the current kernel version and applies any
... ... @@ -106,17 +110,6 @@
106 110 The first argument in the command above is the location of the
107 111 kernel source. Patches are applied from the current directory, but
108 112 an alternative directory can be specified as the second argument.
109   -
110   - - If you are upgrading between releases using the stable series patches
111   - (for example, patch-3.x.y), note that these "dot-releases" are
112   - not incremental and must be applied to the 3.x base tree. For
113   - example, if your base kernel is 3.0 and you want to apply the
114   - 3.0.3 patch, you do not and indeed must not first apply the
115   - 3.0.1 and 3.0.2 patches. Similarly, if you are running kernel
116   - version 3.0.2 and want to jump to 3.0.3, you must first
117   - reverse the 3.0.2 patch (that is, patch -R) _before_ applying
118   - the 3.0.3 patch.
119   - You can read more on this in Documentation/applying-patches.txt
120 113  
121 114 - Make sure you have no stale .o files and dependencies lying around:
122 115