Blame view
Documentation/applying-patches.txt
18.5 KB
609d99a3b Documentation/HOW... |
1 |
.. _applying_patches: |
754c79768 [PATCH] Documenta... |
2 |
|
9299c3e92 Documentation/app... |
3 4 |
Applying Patches To The Linux Kernel ++++++++++++++++++++++++++++++++++++ |
754c79768 [PATCH] Documenta... |
5 |
|
9299c3e92 Documentation/app... |
6 7 8 9 |
Original by: Jesper Juhl, August 2005 Last update: |
330ae7e99 Documentation/app... |
10 |
2016-09-14 |
754c79768 [PATCH] Documenta... |
11 12 13 14 15 16 17 18 19 20 21 22 23 |
A frequently asked question on the Linux Kernel Mailing List is how to apply a patch to the kernel or, more specifically, what base kernel a patch for one of the many trees/branches should be applied to. Hopefully this document will explain this to you. In addition to explaining how to apply and revert patches, a brief description of the different kernel trees (and examples of how to apply their specific patches) is also provided. What is a patch? |
9299c3e92 Documentation/app... |
24 25 26 27 |
================ A patch is a small text document containing a delta of changes between two different versions of a source tree. Patches are created with the ``diff`` |
754c79768 [PATCH] Documenta... |
28 |
program. |
9299c3e92 Documentation/app... |
29 |
|
754c79768 [PATCH] Documenta... |
30 31 32 33 34 35 36 |
To correctly apply a patch you need to know what base it was generated from and what new version the patch will change the source tree into. These should both be present in the patch file metadata or be possible to deduce from the filename. How do I apply or revert a patch? |
9299c3e92 Documentation/app... |
37 38 39 |
================================= You apply a patch with the ``patch`` program. The patch program reads a diff |
754c79768 [PATCH] Documenta... |
40 41 42 43 44 45 46 47 |
(or patch) file and makes the changes to the source tree described in it. Patches for the Linux kernel are generated relative to the parent directory holding the kernel source dir. This means that paths to files inside the patch file contain the name of the kernel source directories it was generated against (or some other directory names like "a/" and "b/"). |
9299c3e92 Documentation/app... |
48 |
|
754c79768 [PATCH] Documenta... |
49 50 51 52 |
Since this is unlikely to match the name of the kernel source dir on your local machine (but is often useful info to see what version an otherwise unlabeled patch was generated against) you should change into your kernel source directory and then strip the first element of the path from filenames |
9299c3e92 Documentation/app... |
53 54 |
in the patch file when applying it (the ``-p1`` argument to ``patch`` does this). |
754c79768 [PATCH] Documenta... |
55 56 |
To revert a previously applied patch, use the -R argument to patch. |
1b49ecf2f docs: Clean up ba... |
57 |
So, if you applied a patch like this:: |
9299c3e92 Documentation/app... |
58 |
|
754c79768 [PATCH] Documenta... |
59 |
patch -p1 < ../patch-x.y.z |
1b49ecf2f docs: Clean up ba... |
60 |
You can revert (undo) it like this:: |
9299c3e92 Documentation/app... |
61 |
|
754c79768 [PATCH] Documenta... |
62 |
patch -R -p1 < ../patch-x.y.z |
9299c3e92 Documentation/app... |
63 64 65 66 |
How do I feed a patch/diff file to ``patch``? ============================================= This (as usual with Linux and other UNIX like operating systems) can be |
754c79768 [PATCH] Documenta... |
67 |
done in several different ways. |
9299c3e92 Documentation/app... |
68 |
|
754c79768 [PATCH] Documenta... |
69 |
In all the examples below I feed the file (in uncompressed form) to patch |
1b49ecf2f docs: Clean up ba... |
70 |
via stdin using the following syntax:: |
9299c3e92 Documentation/app... |
71 |
|
754c79768 [PATCH] Documenta... |
72 73 74 75 76 77 78 |
patch -p1 < path/to/patch-x.y.z If you just want to be able to follow the examples below and don't want to know of more than one way to use patch, then you can stop reading this section here. Patch can also get the name of the file to use via the -i argument, like |
1b49ecf2f docs: Clean up ba... |
79 |
this:: |
9299c3e92 Documentation/app... |
80 |
|
754c79768 [PATCH] Documenta... |
81 |
patch -p1 -i path/to/patch-x.y.z |
330ae7e99 Documentation/app... |
82 |
If your patch file is compressed with gzip or xz and you don't want to |
754c79768 [PATCH] Documenta... |
83 |
uncompress it before applying it, then you can feed it to patch like this |
1b49ecf2f docs: Clean up ba... |
84 |
instead:: |
9299c3e92 Documentation/app... |
85 |
|
330ae7e99 Documentation/app... |
86 87 |
xzcat path/to/patch-x.y.z.xz | patch -p1 bzcat path/to/patch-x.y.z.gz | patch -p1 |
754c79768 [PATCH] Documenta... |
88 89 90 |
If you wish to uncompress the patch file by hand first before applying it (what I assume you've done in the examples below), then you simply run |
1b49ecf2f docs: Clean up ba... |
91 |
gunzip or xz on the file -- like this:: |
9299c3e92 Documentation/app... |
92 |
|
754c79768 [PATCH] Documenta... |
93 |
gunzip patch-x.y.z.gz |
330ae7e99 Documentation/app... |
94 |
xz -d patch-x.y.z.xz |
754c79768 [PATCH] Documenta... |
95 96 |
Which will leave you with a plain text patch-x.y.z file that you can feed to |
9299c3e92 Documentation/app... |
97 |
patch via stdin or the ``-i`` argument, as you prefer. |
754c79768 [PATCH] Documenta... |
98 |
|
9299c3e92 Documentation/app... |
99 |
A few other nice arguments for patch are ``-s`` which causes patch to be silent |
754c79768 [PATCH] Documenta... |
100 |
except for errors which is nice to prevent errors from scrolling out of the |
9299c3e92 Documentation/app... |
101 102 |
screen too fast, and ``--dry-run`` which causes patch to just print a listing of what would happen, but doesn't actually make any changes. Finally ``--verbose`` |
754c79768 [PATCH] Documenta... |
103 104 105 106 |
tells patch to print more information about the work being done. Common errors when patching |
9299c3e92 Documentation/app... |
107 108 109 |
=========================== When patch applies a patch file it attempts to verify the sanity of the |
754c79768 [PATCH] Documenta... |
110 |
file in different ways. |
9299c3e92 Documentation/app... |
111 |
|
2d69049ab Documentation: ch... |
112 |
Checking that the file looks like a valid patch file and checking the code |
754c79768 [PATCH] Documenta... |
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 |
around the bits being modified matches the context provided in the patch are just two of the basic sanity checks patch does. If patch encounters something that doesn't look quite right it has two options. It can either refuse to apply the changes and abort or it can try to find a way to make the patch apply with a few minor changes. One example of something that's not 'quite right' that patch will attempt to fix up is if all the context matches, the lines being changed match, but the line numbers are different. This can happen, for example, if the patch makes a change in the middle of the file but for some reasons a few lines have been added or removed near the beginning of the file. In that case everything looks good it has just moved up or down a bit, and patch will usually adjust the line numbers and apply the patch. Whenever patch applies a patch that it had to modify a bit to make it fit |
9299c3e92 Documentation/app... |
129 |
it'll tell you about it by saying the patch applied with **fuzz**. |
754c79768 [PATCH] Documenta... |
130 131 132 133 134 |
You should be wary of such changes since even though patch probably got it right it doesn't /always/ get it right, and the result will sometimes be wrong. When patch encounters a change that it can't fix up with fuzz it rejects it |
9299c3e92 Documentation/app... |
135 |
outright and leaves a file with a ``.rej`` extension (a reject file). You can |
90f2447d0 [PATCH] Documenta... |
136 |
read this file to see exactly what change couldn't be applied, so you can |
754c79768 [PATCH] Documenta... |
137 |
go fix it up by hand if you wish. |
c594a50db [PATCH] Docs upda... |
138 |
If you don't have any third-party patches applied to your kernel source, but |
754c79768 [PATCH] Documenta... |
139 140 141 142 143 |
only patches from kernel.org and you apply the patches in the correct order, and have made no modifications yourself to the source files, then you should never see a fuzz or reject message from patch. If you do see such messages anyway, then there's a high risk that either your local source tree or the patch file is corrupted in some way. In that case you should probably try |
90f2447d0 [PATCH] Documenta... |
144 |
re-downloading the patch and if things are still not OK then you'd be advised |
754c79768 [PATCH] Documenta... |
145 146 147 |
to start with a fresh tree downloaded in full from kernel.org. Let's look a bit more at some of the messages patch can produce. |
9299c3e92 Documentation/app... |
148 |
If patch stops and presents a ``File to patch:`` prompt, then patch could not |
754c79768 [PATCH] Documenta... |
149 150 |
find a file to be patched. Most likely you forgot to specify -p1 or you are in the wrong directory. Less often, you'll find patches that need to be |
9299c3e92 Documentation/app... |
151 |
applied with ``-p0`` instead of ``-p1`` (reading the patch file should reveal if |
c594a50db [PATCH] Docs upda... |
152 |
this is the case -- if so, then this is an error by the person who created |
754c79768 [PATCH] Documenta... |
153 |
the patch but is not fatal). |
9299c3e92 Documentation/app... |
154 |
If you get ``Hunk #2 succeeded at 1887 with fuzz 2 (offset 7 lines).`` or a |
754c79768 [PATCH] Documenta... |
155 156 157 |
message similar to that, then it means that patch had to adjust the location of the change (in this example it needed to move 7 lines from where it expected to make the change to make it fit). |
9299c3e92 Documentation/app... |
158 |
|
754c79768 [PATCH] Documenta... |
159 160 |
The resulting file may or may not be OK, depending on the reason the file was different than expected. |
9299c3e92 Documentation/app... |
161 |
|
754c79768 [PATCH] Documenta... |
162 163 |
This often happens if you try to apply a patch that was generated against a different kernel version than the one you are trying to patch. |
9299c3e92 Documentation/app... |
164 |
If you get a message like ``Hunk #3 FAILED at 2387.``, then it means that the |
754c79768 [PATCH] Documenta... |
165 |
patch could not be applied correctly and the patch program was unable to |
9299c3e92 Documentation/app... |
166 167 |
fuzz its way through. This will generate a ``.rej`` file with the change that caused the patch to fail and also a ``.orig`` file showing you the original |
754c79768 [PATCH] Documenta... |
168 |
content that couldn't be changed. |
9299c3e92 Documentation/app... |
169 |
If you get ``Reversed (or previously applied) patch detected! Assume -R? [n]`` |
754c79768 [PATCH] Documenta... |
170 171 |
then patch detected that the change contained in the patch seems to have already been made. |
9299c3e92 Documentation/app... |
172 |
|
754c79768 [PATCH] Documenta... |
173 174 175 |
If you actually did apply this patch previously and you just re-applied it in error, then just say [n]o and abort this patch. If you applied this patch previously and actually intended to revert it, but forgot to specify -R, |
9299c3e92 Documentation/app... |
176 |
then you can say [**y**]es here to make patch revert it for you. |
754c79768 [PATCH] Documenta... |
177 178 179 |
This can also happen if the creator of the patch reversed the source and destination directories when creating the patch, and in that case reverting the patch will in fact apply it. |
9299c3e92 Documentation/app... |
180 181 182 183 |
A message similar to ``patch: **** unexpected end of file in patch`` or ``patch unexpectedly ends in middle of line`` means that patch could make no sense of the file you fed to it. Either your download is broken, you tried to feed patch a compressed patch file without uncompressing it first, or the patch |
c594a50db [PATCH] Docs upda... |
184 185 186 187 |
file that you are using has been mangled by a mail client or mail transfer agent along the way somewhere, e.g., by splitting a long line into two lines. Often these warnings can easily be fixed by joining (concatenating) the two lines that had been split. |
754c79768 [PATCH] Documenta... |
188 189 190 191 |
As I already mentioned above, these errors should never happen if you apply a patch from kernel.org to the correct version of an unmodified source tree. So if you get these errors with kernel.org patches then you should probably |
c594a50db [PATCH] Docs upda... |
192 |
assume that either your patch file or your tree is broken and I'd advise you |
754c79768 [PATCH] Documenta... |
193 194 |
to start over with a fresh download of a full kernel tree and the patch you wish to apply. |
9299c3e92 Documentation/app... |
195 196 |
Are there any alternatives to ``patch``? ======================================== |
90f2447d0 [PATCH] Documenta... |
197 |
|
9299c3e92 Documentation/app... |
198 199 200 201 |
Yes there are alternatives. You can use the ``interdiff`` program (http://cyberelk.net/tim/patchutils/) to |
90f2447d0 [PATCH] Documenta... |
202 203 |
generate a patch representing the differences between two patches and then apply the result. |
9299c3e92 Documentation/app... |
204 |
|
330ae7e99 Documentation/app... |
205 |
This will let you move from something like 4.7.2 to 4.7.3 in a single |
754c79768 [PATCH] Documenta... |
206 207 208 |
step. The -z flag to interdiff will even let you feed it patches in gzip or bzip2 compressed form directly without the use of zcat or bzcat or manual decompression. |
1b49ecf2f docs: Clean up ba... |
209 |
Here's how you'd go from 4.7.2 to 4.7.3 in a single step:: |
9299c3e92 Documentation/app... |
210 |
|
330ae7e99 Documentation/app... |
211 |
interdiff -z ../patch-4.7.2.gz ../patch-4.7.3.gz | patch -p1 |
754c79768 [PATCH] Documenta... |
212 213 214 |
Although interdiff may save you a step or two you are generally advised to do the additional steps since interdiff can get things wrong in some cases. |
9299c3e92 Documentation/app... |
215 |
Another alternative is ``ketchup``, which is a python script for automatic |
754c79768 [PATCH] Documenta... |
216 |
downloading and applying of patches (http://www.selenic.com/ketchup/). |
9299c3e92 Documentation/app... |
217 |
Other nice tools are diffstat, which shows a summary of changes made by a |
c594a50db [PATCH] Docs upda... |
218 219 220 |
patch; lsdiff, which displays a short listing of affected files in a patch file, along with (optionally) the line numbers of the start of each patch; and grepdiff, which displays a list of the files modified by a patch where |
754c79768 [PATCH] Documenta... |
221 222 223 224 |
the patch contains a given regular expression. Where can I download the patches? |
9299c3e92 Documentation/app... |
225 226 227 |
================================= The patches are available at http://kernel.org/ |
754c79768 [PATCH] Documenta... |
228 229 |
Most recent patches are linked from the front page, but they also have specific homes. |
330ae7e99 Documentation/app... |
230 |
The 4.x.y (-stable) and 4.x patches live at |
9299c3e92 Documentation/app... |
231 |
|
330ae7e99 Documentation/app... |
232 |
ftp://ftp.kernel.org/pub/linux/kernel/v4.x/ |
754c79768 [PATCH] Documenta... |
233 234 |
The -rc patches live at |
9299c3e92 Documentation/app... |
235 |
|
330ae7e99 Documentation/app... |
236 |
ftp://ftp.kernel.org/pub/linux/kernel/v4.x/testing/ |
9299c3e92 Documentation/app... |
237 238 |
In place of ``ftp.kernel.org`` you can use ``ftp.cc.kernel.org``, where cc is a |
754c79768 [PATCH] Documenta... |
239 240 |
country code. This way you'll be downloading from a mirror site that's most likely geographically closer to you, resulting in faster downloads for you, |
c594a50db [PATCH] Docs upda... |
241 242 |
less bandwidth used globally and less load on the main kernel.org servers -- these are good things, so do use mirrors when possible. |
754c79768 [PATCH] Documenta... |
243 |
|
330ae7e99 Documentation/app... |
244 245 |
The 4.x kernels =============== |
9299c3e92 Documentation/app... |
246 247 |
These are the base stable releases released by Linus. The highest numbered |
754c79768 [PATCH] Documenta... |
248 |
release is the most recent. |
c594a50db [PATCH] Docs upda... |
249 |
If regressions or other serious flaws are found, then a -stable fix patch |
330ae7e99 Documentation/app... |
250 |
will be released (see below) on top of this base. Once a new 4.x base |
754c79768 [PATCH] Documenta... |
251 |
kernel is released, a patch is made available that is a delta between the |
330ae7e99 Documentation/app... |
252 |
previous 4.x kernel and the new one. |
754c79768 [PATCH] Documenta... |
253 |
|
330ae7e99 Documentation/app... |
254 255 256 257 |
To apply a patch moving from 4.6 to 4.7, you'd do the following (note that such patches do **NOT** apply on top of 4.x.y kernels but on top of the base 4.x kernel -- if you need to move from 4.x.y to 4.x+1 you need to first revert the 4.x.y patch). |
754c79768 [PATCH] Documenta... |
258 |
|
1b49ecf2f docs: Clean up ba... |
259 |
Here are some examples:: |
9299c3e92 Documentation/app... |
260 |
|
330ae7e99 Documentation/app... |
261 262 263 264 |
# moving from 4.6 to 4.7 $ cd ~/linux-4.6 # change to kernel source dir $ patch -p1 < ../patch-4.7 # apply the 4.7 patch |
9299c3e92 Documentation/app... |
265 |
$ cd .. |
330ae7e99 Documentation/app... |
266 |
$ mv linux-4.6 linux-4.7 # rename source dir |
754c79768 [PATCH] Documenta... |
267 |
|
330ae7e99 Documentation/app... |
268 269 270 271 272 273 |
# moving from 4.6.1 to 4.7 $ cd ~/linux-4.6.1 # change to kernel source dir $ patch -p1 -R < ../patch-4.6.1 # revert the 4.6.1 patch # source dir is now 4.6 $ patch -p1 < ../patch-4.7 # apply new 4.7 patch |
9299c3e92 Documentation/app... |
274 |
$ cd .. |
330ae7e99 Documentation/app... |
275 |
$ mv linux-4.6.1 linux-4.7 # rename source dir |
754c79768 [PATCH] Documenta... |
276 |
|
330ae7e99 Documentation/app... |
277 278 |
The 4.x.y kernels ================= |
9299c3e92 Documentation/app... |
279 |
|
330ae7e99 Documentation/app... |
280 |
Kernels with 3-digit versions are -stable kernels. They contain small(ish) |
754c79768 [PATCH] Documenta... |
281 |
critical fixes for security problems or significant regressions discovered |
330ae7e99 Documentation/app... |
282 |
in a given 4.x kernel. |
754c79768 [PATCH] Documenta... |
283 284 285 286 |
This is the recommended branch for users who want the most recent stable kernel and are not interested in helping test development/experimental versions. |
330ae7e99 Documentation/app... |
287 |
If no 4.x.y kernel is available, then the highest numbered 4.x kernel is |
754c79768 [PATCH] Documenta... |
288 |
the current stable kernel. |
9299c3e92 Documentation/app... |
289 290 291 |
.. note:: The -stable team usually do make incremental patches available as well |
c594a50db [PATCH] Docs upda... |
292 293 |
as patches against the latest mainline release, but I only cover the non-incremental ones below. The incremental ones can be found at |
330ae7e99 Documentation/app... |
294 |
ftp://ftp.kernel.org/pub/linux/kernel/v4.x/incr/ |
c594a50db [PATCH] Docs upda... |
295 |
|
330ae7e99 Documentation/app... |
296 297 298 |
These patches are not incremental, meaning that for example the 4.7.3 patch does not apply on top of the 4.7.2 kernel source, but rather on top of the base 4.7 kernel source. |
9299c3e92 Documentation/app... |
299 |
|
330ae7e99 Documentation/app... |
300 301 302 |
So, in order to apply the 4.7.3 patch to your existing 4.7.2 kernel source you have to first back out the 4.7.2 patch (so you are left with a base 4.7 kernel source) and then apply the new 4.7.3 patch. |
754c79768 [PATCH] Documenta... |
303 |
|
1b49ecf2f docs: Clean up ba... |
304 |
Here's a small example:: |
754c79768 [PATCH] Documenta... |
305 |
|
330ae7e99 Documentation/app... |
306 307 308 |
$ cd ~/linux-4.7.2 # change to the kernel source dir $ patch -p1 -R < ../patch-4.7.2 # revert the 4.7.2 patch $ patch -p1 < ../patch-4.7.3 # apply the new 4.7.3 patch |
9299c3e92 Documentation/app... |
309 |
$ cd .. |
330ae7e99 Documentation/app... |
310 |
$ mv linux-4.7.2 linux-4.7.3 # rename the kernel source dir |
754c79768 [PATCH] Documenta... |
311 312 |
The -rc kernels |
9299c3e92 Documentation/app... |
313 314 315 |
=============== These are release-candidate kernels. These are development kernels released |
754c79768 [PATCH] Documenta... |
316 317 318 319 320 321 322 323 324 325 326 327 |
by Linus whenever he deems the current git (the kernel's source management tool) tree to be in a reasonably sane state adequate for testing. These kernels are not stable and you should expect occasional breakage if you intend to run them. This is however the most stable of the main development branches and is also what will eventually turn into the next stable kernel, so it is important that it be tested by as many people as possible. This is a good branch to run for people who want to help out testing development kernels but do not want to run some of the really experimental stuff (such people should see the sections about -git and -mm kernels below). |
330ae7e99 Documentation/app... |
328 329 |
The -rc patches are not incremental, they apply to a base 4.x kernel, just like the 4.x.y patches described above. The kernel version before the -rcN |
754c79768 [PATCH] Documenta... |
330 331 |
suffix denotes the version of the kernel that this -rc kernel will eventually turn into. |
9299c3e92 Documentation/app... |
332 |
|
330ae7e99 Documentation/app... |
333 334 |
So, 4.8-rc5 means that this is the fifth release candidate for the 4.8 kernel and the patch should be applied on top of the 4.7 kernel source. |
754c79768 [PATCH] Documenta... |
335 |
|
1b49ecf2f docs: Clean up ba... |
336 |
Here are 3 examples of how to apply these patches:: |
9299c3e92 Documentation/app... |
337 |
|
330ae7e99 Documentation/app... |
338 339 340 341 |
# first an example of moving from 4.7 to 4.8-rc3 $ cd ~/linux-4.7 # change to the 4.7 source dir $ patch -p1 < ../patch-4.8-rc3 # apply the 4.8-rc3 patch |
9299c3e92 Documentation/app... |
342 |
$ cd .. |
330ae7e99 Documentation/app... |
343 |
$ mv linux-4.7 linux-4.8-rc3 # rename the source dir |
754c79768 [PATCH] Documenta... |
344 |
|
330ae7e99 Documentation/app... |
345 346 347 348 349 |
# now let's move from 4.8-rc3 to 4.8-rc5 $ cd ~/linux-4.8-rc3 # change to the 4.8-rc3 dir $ patch -p1 -R < ../patch-4.8-rc3 # revert the 4.8-rc3 patch $ patch -p1 < ../patch-4.8-rc5 # apply the new 4.8-rc5 patch |
9299c3e92 Documentation/app... |
350 |
$ cd .. |
330ae7e99 Documentation/app... |
351 352 353 |
$ mv linux-4.8-rc3 linux-4.8-rc5 # rename the source dir # finally let's try and move from 4.7.3 to 4.8-rc5 |
754c79768 [PATCH] Documenta... |
354 |
|
330ae7e99 Documentation/app... |
355 356 357 |
$ cd ~/linux-4.7.3 # change to the kernel source dir $ patch -p1 -R < ../patch-4.7.3 # revert the 4.7.3 patch $ patch -p1 < ../patch-4.8-rc5 # apply new 4.8-rc5 patch |
9299c3e92 Documentation/app... |
358 |
$ cd .. |
330ae7e99 Documentation/app... |
359 |
$ mv linux-4.7.3 linux-4.8-rc5 # rename the kernel source dir |
754c79768 [PATCH] Documenta... |
360 361 362 |
The -git kernels |
9299c3e92 Documentation/app... |
363 364 365 |
================ These are daily snapshots of Linus' kernel tree (managed in a git |
754c79768 [PATCH] Documenta... |
366 367 368 |
repository, hence the name). These patches are usually released daily and represent the current state of |
c594a50db [PATCH] Docs upda... |
369 |
Linus's tree. They are more experimental than -rc kernels since they are |
754c79768 [PATCH] Documenta... |
370 371 |
generated automatically without even a cursory glance to see if they are sane. |
330ae7e99 Documentation/app... |
372 373 374 375 |
-git patches are not incremental and apply either to a base 4.x kernel or a base 4.x-rc kernel -- you can see which from their name. A patch named 4.7-git1 applies to the 4.7 kernel source and a patch named 4.8-rc3-git2 applies to the source of the 4.8-rc3 kernel. |
754c79768 [PATCH] Documenta... |
376 |
|
1b49ecf2f docs: Clean up ba... |
377 |
Here are some examples of how to apply these patches:: |
754c79768 [PATCH] Documenta... |
378 |
|
330ae7e99 Documentation/app... |
379 |
# moving from 4.7 to 4.7-git1 |
754c79768 [PATCH] Documenta... |
380 |
|
330ae7e99 Documentation/app... |
381 382 383 384 |
$ cd ~/linux-4.7 # change to the kernel source dir $ patch -p1 < ../patch-4.7-git1 # apply the 4.7-git1 patch $ cd .. $ mv linux-4.7 linux-4.7-git1 # rename the kernel source dir |
754c79768 [PATCH] Documenta... |
385 |
|
330ae7e99 Documentation/app... |
386 |
# moving from 4.7-git1 to 4.8-rc2-git3 |
9299c3e92 Documentation/app... |
387 |
|
330ae7e99 Documentation/app... |
388 389 390 391 392 393 394 395 396 |
$ cd ~/linux-4.7-git1 # change to the kernel source dir $ patch -p1 -R < ../patch-4.7-git1 # revert the 4.7-git1 patch # we now have a 4.7 kernel $ patch -p1 < ../patch-4.8-rc2 # apply the 4.8-rc2 patch # the kernel is now 4.8-rc2 $ patch -p1 < ../patch-4.8-rc2-git3 # apply the 4.8-rc2-git3 patch # the kernel is now 4.8-rc2-git3 $ cd .. $ mv linux-4.7-git1 linux-4.8-rc2-git3 # rename source dir |
754c79768 [PATCH] Documenta... |
397 |
|
9299c3e92 Documentation/app... |
398 |
|
330ae7e99 Documentation/app... |
399 400 |
The -mm patches and the linux-next tree ======================================= |
754c79768 [PATCH] Documenta... |
401 |
|
330ae7e99 Documentation/app... |
402 |
The -mm patches are experimental patches released by Andrew Morton. |
9299c3e92 Documentation/app... |
403 |
|
330ae7e99 Documentation/app... |
404 405 406 407 408 |
In the past, -mm tree were used to also test subsystem patches, but this function is now done via the :ref:`linux-next <https://www.kernel.org/doc/man-pages/linux-next.html>` tree. The Subsystem maintainers push their patches first to linux-next, and, during the merge window, sends them directly to Linus. |
754c79768 [PATCH] Documenta... |
409 |
|
330ae7e99 Documentation/app... |
410 411 412 413 |
The -mm patches serve as a sort of proving ground for new features and other experimental patches that aren't merged via a subsystem tree. Once such patches has proved its worth in -mm for a while Andrew pushes it on to Linus for inclusion in mainline. |
754c79768 [PATCH] Documenta... |
414 |
|
330ae7e99 Documentation/app... |
415 416 |
The linux-next tree is daily updated, and includes the -mm patches. Both are in constant flux and contains many experimental features, a |
c594a50db [PATCH] Docs upda... |
417 |
lot of debugging patches not appropriate for mainline etc., and is the most |
754c79768 [PATCH] Documenta... |
418 |
experimental of the branches described in this document. |
330ae7e99 Documentation/app... |
419 |
These patches are not appropriate for use on systems that are supposed to be |
754c79768 [PATCH] Documenta... |
420 |
stable and they are more risky to run than any of the other branches (make |
c594a50db [PATCH] Docs upda... |
421 |
sure you have up-to-date backups -- that goes for any experimental kernel but |
330ae7e99 Documentation/app... |
422 |
even more so for -mm patches or using a Kernel from the linux-next tree). |
754c79768 [PATCH] Documenta... |
423 |
|
330ae7e99 Documentation/app... |
424 425 426 427 |
Testing of -mm patches and linux-next is greatly appreciated since the whole point of those are to weed out regressions, crashes, data corruption bugs, build breakage (and any other bug in general) before changes are merged into the more stable mainline Linus tree. |
9299c3e92 Documentation/app... |
428 |
|
330ae7e99 Documentation/app... |
429 430 |
But testers of -mm and linux-next should be aware that breakages are more common than in any other tree. |
754c79768 [PATCH] Documenta... |
431 |
|
90f2447d0 [PATCH] Documenta... |
432 433 434 435 436 437 438 |
This concludes this list of explanations of the various kernel trees. I hope you are now clear on how to apply the various patches and help testing the kernel. Thank you's to Randy Dunlap, Rolf Eike Beer, Linus Torvalds, Bodo Eggert, Johannes Stezenbach, Grant Coady, Pavel Machek and others that I may have forgotten for their reviews and contributions to this document. |
754c79768 [PATCH] Documenta... |
439 |