Skip to content

Commit fa04150

Browse files
bagasmeJonathan Corbet
authored andcommitted
Documentation: describe how to apply incremental stable patches
The applying patches document (Documentation/process/applying-patches.rst) mentions incremental stable patches, but there is no example of how to apply them. Describe the process. While at it, remove note about incremental patches and move the external link of 5.x.y incremental patches to "Where can I download patches?" section. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Link: https://lore.kernel.org/r/20220307063340.256671-1-bagasdotme@gmail.com Signed-off-by: Jonathan Corbet <corbet@lwn.net>
1 parent 78cebdb commit fa04150

1 file changed

Lines changed: 23 additions & 5 deletions

File tree

Documentation/process/applying-patches.rst

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ The 5.x.y (-stable) and 5.x patches live at
249249

250250
https://www.kernel.org/pub/linux/kernel/v5.x/
251251

252+
The 5.x.y incremental patches live at
253+
254+
https://www.kernel.org/pub/linux/kernel/v5.x/incr/
255+
252256
The -rc patches are not stored on the webserver but are generated on
253257
demand from git tags such as
254258

@@ -308,12 +312,11 @@ versions.
308312
If no 5.x.y kernel is available, then the highest numbered 5.x kernel is
309313
the current stable kernel.
310314

311-
.. note::
315+
The -stable team provides normal as well as incremental patches. Below is
316+
how to apply these patches.
312317

313-
The -stable team usually do make incremental patches available as well
314-
as patches against the latest mainline release, but I only cover the
315-
non-incremental ones below. The incremental ones can be found at
316-
https://www.kernel.org/pub/linux/kernel/v5.x/incr/
318+
Normal patches
319+
~~~~~~~~~~~~~~
317320

318321
These patches are not incremental, meaning that for example the 5.7.3
319322
patch does not apply on top of the 5.7.2 kernel source, but rather on top
@@ -331,6 +334,21 @@ Here's a small example::
331334
$ cd ..
332335
$ mv linux-5.7.2 linux-5.7.3 # rename the kernel source dir
333336

337+
Incremental patches
338+
~~~~~~~~~~~~~~~~~~~
339+
340+
Incremental patches are different: instead of being applied on top
341+
of base 5.x kernel, they are applied on top of previous stable kernel
342+
(5.x.y-1).
343+
344+
Here's the example to apply these::
345+
346+
$ cd ~/linux-5.7.2 # change to the kernel source dir
347+
$ patch -p1 < ../patch-5.7.2-3 # apply the new 5.7.3 patch
348+
$ cd ..
349+
$ mv linux-5.7.2 linux-5.7.3 # rename the kernel source dir
350+
351+
334352
The -rc kernels
335353
===============
336354

0 commit comments

Comments
 (0)