dsphinx.addnodesdocument)}( rawsourcechildren]( translations LanguagesNode)}(hhh](h pending_xref)}(hhh]docutils.nodesTextChinese (Simplified)}parenthsba attributes}(ids]classes]names]dupnames]backrefs] refdomainstdreftypedoc reftarget,/translations/zh_CN/process/applying-patchesmodnameN classnameN refexplicitutagnamehhh ubh)}(hhh]hChinese (Traditional)}hh2sbah}(h]h ]h"]h$]h&] refdomainh)reftypeh+ reftarget,/translations/zh_TW/process/applying-patchesmodnameN classnameN refexplicituh1hhh ubh)}(hhh]hItalian}hhFsbah}(h]h ]h"]h$]h&] refdomainh)reftypeh+ reftarget,/translations/it_IT/process/applying-patchesmodnameN classnameN refexplicituh1hhh ubh)}(hhh]hJapanese}hhZsbah}(h]h ]h"]h$]h&] refdomainh)reftypeh+ reftarget,/translations/ja_JP/process/applying-patchesmodnameN classnameN refexplicituh1hhh ubh)}(hhh]hKorean}hhnsbah}(h]h ]h"]h$]h&] refdomainh)reftypeh+ reftarget,/translations/ko_KR/process/applying-patchesmodnameN classnameN refexplicituh1hhh ubh)}(hhh]hSpanish}hhsbah}(h]h ]h"]h$]h&] refdomainh)reftypeh+ reftarget,/translations/sp_SP/process/applying-patchesmodnameN classnameN refexplicituh1hhh ubeh}(h]h ]h"]h$]h&]current_languageEnglishuh1h hh _documenthsourceNlineNubhtarget)}(h.. _applying_patches:h]h}(h]h ]h"]h$]h&]refidapplying-patchesuh1hhKhhhhhF/var/lib/git/docbuild/linux/Documentation/process/applying-patches.rstubhsection)}(hhh](htitle)}(h$Applying Patches To The Linux Kernelh]h$Applying Patches To The Linux Kernel}(hhhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhhhhhKubhdefinition_list)}(hhh]hdefinition_list_item)}(h&Original by: Jesper Juhl, August 2005 h](hterm)}(h Original by:h]h Original by:}(hhhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhhubh definition)}(hhh]h paragraph)}(hJesper Juhl, August 2005h]hJesper Juhl, August 2005}(hhhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhhubah}(h]h ]h"]h$]h&]uh1hhhubeh}(h]h ]h"]h$]h&]uh1hhhhKhhubah}(h]h ]h"]h$]h&]uh1hhhhhhhhNubhnote)}(hThis document is obsolete. In most cases, rather than using ``patch`` manually, you'll almost certainly want to look at using Git instead.h]h)}(hThis document is obsolete. In most cases, rather than using ``patch`` manually, you'll almost certainly want to look at using Git instead.h](h=This document is obsolete. In most cases, rather than using }(hj hhhNhNubhliteral)}(h ``patch``h]hpatch}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhj ubhG manually, you’ll almost certainly want to look at using Git instead.}(hj hhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhK hj ubah}(h]h ]h"]h$]h&]uh1jhhhhhhhNubh)}(hA 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.h]hA 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.}(hj5hhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhhhhubh)}(hIn 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.h]hIn 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.}(hjChhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhhhhubh)}(hhh](h)}(hWhat is a patch?h]hWhat is a patch?}(hjThhhNhNubah}(h]h ]h"]h$]h&]uh1hhjQhhhhhKubh)}(hA 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`` program.h](hA patch is a small text document containing a delta of changes between two different versions of a source tree. Patches are created with the }(hjbhhhNhNubj)}(h``diff``h]hdiff}(hjjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjbubh program.}(hjbhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjQhhubh)}(hTo 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.h]hTo 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.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjQhhubeh}(h]what-is-a-patchah ]h"]what is a patch?ah$]h&]uh1hhhhhhhhKubh)}(hhh](h)}(h!How do I apply or revert a patch?h]h!How do I apply or revert a patch?}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhjhhhhhK&ubh)}(hYou apply a patch with the ``patch`` program. The patch program reads a diff (or patch) file and makes the changes to the source tree described in it.h](hYou apply a patch with the }(hjhhhNhNubj)}(h ``patch``h]hpatch}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubhr program. The patch program reads a diff (or patch) file and makes the changes to the source tree described in it.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhK(hjhhubh)}(hjPatches for the Linux kernel are generated relative to the parent directory holding the kernel source dir.h]hjPatches for the Linux kernel are generated relative to the parent directory holding the kernel source dir.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhK+hjhhubh)}(hThis 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/").h]hThis 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/”).}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhK.hjhhubh)}(hX{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 in the patch file when applying it (the ``-p1`` argument to ``patch`` does this).h](hXRSince 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 in the patch file when applying it (the }(hjhhhNhNubj)}(h``-p1``h]h-p1}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh argument to }(hjhhhNhNubj)}(h ``patch``h]hpatch}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh does this).}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhK2hjhhubh)}(hjTo revert a previously applied patch, use the -R argument to patch. So, if you applied a patch like this::h]hiTo revert a previously applied patch, use the -R argument to patch. So, if you applied a patch like this:}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhK9hjhhubh literal_block)}(hpatch -p1 < ../patch-x.y.zh]hpatch -p1 < ../patch-x.y.z}hj'sbah}(h]h ]h"]h$]h&] xml:spacepreserveuh1j%hhhKhjhhubj&)}(hpatch -R -p1 < ../patch-x.y.zh]hpatch -R -p1 < ../patch-x.y.z}hjEsbah}(h]h ]h"]h$]h&]j5j6uh1j%hhhK@hjhhubeh}(h] how-do-i-apply-or-revert-a-patchah ]h"]!how do i apply or revert a patch?ah$]h&]uh1hhhhhhhhK&ubh)}(hhh](h)}(h-How do I feed a patch/diff file to ``patch``?h](h#How do I feed a patch/diff file to }(hj^hhhNhNubj)}(h ``patch``h]hpatch}(hjfhhhNhNubah}(h]h ]h"]h$]h&]uh1jhj^ubh?}(hj^hhhNhNubeh}(h]h ]h"]h$]h&]uh1hhj[hhhhhKDubh)}(hgThis (as usual with Linux and other UNIX like operating systems) can be done in several different ways.h]hgThis (as usual with Linux and other UNIX like operating systems) can be done in several different ways.}(hj~hhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKFhj[hhubh)}(hpIn all the examples below I feed the file (in uncompressed form) to patch via stdin using the following syntax::h]hoIn all the examples below I feed the file (in uncompressed form) to patch via stdin using the following syntax:}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKIhj[hhubj&)}(hpatch -p1 < path/to/patch-x.y.zh]hpatch -p1 < path/to/patch-x.y.z}hjsbah}(h]h ]h"]h$]h&]j5j6uh1j%hhhKLhj[hhubh)}(hIf 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.h]hIf 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.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKNhj[hhubh)}(hOPatch can also get the name of the file to use via the -i argument, like this::h]hNPatch can also get the name of the file to use via the -i argument, like this:}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKRhj[hhubj&)}(h patch -p1 -i path/to/patch-x.y.zh]h patch -p1 -i path/to/patch-x.y.z}hjsbah}(h]h ]h"]h$]h&]j5j6uh1j%hhhKUhj[hhubh)}(hIf your patch file is compressed with gzip or xz and you don't want to uncompress it before applying it, then you can feed it to patch like this instead::h]hIf your patch file is compressed with gzip or xz and you don’t want to uncompress it before applying it, then you can feed it to patch like this instead:}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKWhj[hhubj&)}(hQxzcat path/to/patch-x.y.z.xz | patch -p1 bzcat path/to/patch-x.y.z.gz | patch -p1h]hQxzcat path/to/patch-x.y.z.xz | patch -p1 bzcat path/to/patch-x.y.z.gz | patch -p1}hjsbah}(h]h ]h"]h$]h&]j5j6uh1j%hhhK[hj[hhubh)}(hIf 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 gunzip or xz on the file -- like this::h]hIf 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 gunzip or xz on the file -- like this:}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhK^hj[hhubj&)}(h*gunzip patch-x.y.z.gz xz -d patch-x.y.z.xzh]h*gunzip patch-x.y.z.gz xz -d patch-x.y.z.xz}hjsbah}(h]h ]h"]h$]h&]j5j6uh1j%hhhKbhj[hhubh)}(hWhich will leave you with a plain text patch-x.y.z file that you can feed to patch via stdin or the ``-i`` argument, as you prefer.h](hdWhich will leave you with a plain text patch-x.y.z file that you can feed to patch via stdin or the }(hj hhhNhNubj)}(h``-i``h]h-i}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhj ubh argument, as you prefer.}(hj hhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKehj[hhubh)}(hX}A few other nice arguments for patch are ``-s`` which causes patch to be silent except for errors which is nice to prevent errors from scrolling out of the 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`` tells patch to print more information about the work being done.h](h)A few other nice arguments for patch are }(hj*hhhNhNubj)}(h``-s``h]h-s}(hj2hhhNhNubah}(h]h ]h"]h$]h&]uh1jhj*ubh which causes patch to be silent except for errors which is nice to prevent errors from scrolling out of the screen too fast, and }(hj*hhhNhNubj)}(h ``--dry-run``h]h --dry-run}(hjDhhhNhNubah}(h]h ]h"]h$]h&]uh1jhj*ubhs which causes patch to just print a listing of what would happen, but doesn’t actually make any changes. Finally }(hj*hhhNhNubj)}(h ``--verbose``h]h --verbose}(hjVhhhNhNubah}(h]h ]h"]h$]h&]uh1jhj*ubhA tells patch to print more information about the work being done.}(hj*hhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhhj[hhubeh}(h](how-do-i-feed-a-patch-diff-file-to-patchah ]h"])how do i feed a patch/diff file to patch?ah$]h&]uh1hhhhhhhhKDubh)}(hhh](h)}(hCommon errors when patchingh]hCommon errors when patching}(hjyhhhNhNubah}(h]h ]h"]h$]h&]uh1hhjvhhhhhKpubh)}(h_When patch applies a patch file it attempts to verify the sanity of the file in different ways.h]h_When patch applies a patch file it attempts to verify the sanity of the file in different ways.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKrhjvhhubh)}(hChecking that the file looks like a valid patch file and checking the code around the bits being modified matches the context provided in the patch are just two of the basic sanity checks patch does.h]hChecking that the file looks like a valid patch file and checking the code around the bits being modified matches the context provided in the patch are just two of the basic sanity checks patch does.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKuhjvhhubh)}(hIf 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.h]hIf 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.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKyhjvhhubh)}(hXOne 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.h]hXOne 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.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhK}hjvhhubh)}(hX'Whenever patch applies a patch that it had to modify a bit to make it fit it'll tell you about it by saying the patch applied with **fuzz**. 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.h](hWhenever patch applies a patch that it had to modify a bit to make it fit it’ll tell you about it by saying the patch applied with }(hjhhhNhNubhstrong)}(h**fuzz**h]hfuzz}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh. 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.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hXWhen patch encounters a change that it can't fix up with fuzz it rejects it outright and leaves a file with a ``.rej`` extension (a reject file). You can read this file to see exactly what change couldn't be applied, so you can go fix it up by hand if you wish.h](hpWhen patch encounters a change that it can’t fix up with fuzz it rejects it outright and leaves a file with a }(hjhhhNhNubj)}(h``.rej``h]h.rej}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh extension (a reject file). You can read this file to see exactly what change couldn’t be applied, so you can go fix it up by hand if you wish.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hXSIf you don't have any third-party patches applied to your kernel source, but 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 re-downloading the patch and if things are still not OK then you'd be advised to start with a fresh tree downloaded in full from kernel.org.h]hXYIf you don’t have any third-party patches applied to your kernel source, but 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 re-downloading the patch and if things are still not OK then you’d be advised to start with a fresh tree downloaded in full from kernel.org.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(h@Let's look a bit more at some of the messages patch can produce.h]hBLet’s look a bit more at some of the messages patch can produce.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hXIf patch stops and presents a ``File to patch:`` prompt, then patch could not 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 applied with ``-p0`` instead of ``-p1`` (reading the patch file should reveal if this is the case -- if so, then this is an error by the person who created the patch but is not fatal).h](hIf patch stops and presents a }(hjhhhNhNubj)}(h``File to patch:``h]hFile to patch:}(hj%hhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh prompt, then patch could not 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 applied with }(hjhhhNhNubj)}(h``-p0``h]h-p0}(hj7hhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh instead of }(hjhhhNhNubj)}(h``-p1``h]h-p1}(hjIhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh (reading the patch file should reveal if this is the case -- if so, then this is an error by the person who created the patch but is not fatal).}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hX If you get ``Hunk #2 succeeded at 1887 with fuzz 2 (offset 7 lines).`` or a 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).h](h If you get }(hjahhhNhNubj)}(h;``Hunk #2 succeeded at 1887 with fuzz 2 (offset 7 lines).``h]h7Hunk #2 succeeded at 1887 with fuzz 2 (offset 7 lines).}(hjihhhNhNubah}(h]h ]h"]h$]h&]uh1jhjaubh or a 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).}(hjahhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hfThe resulting file may or may not be OK, depending on the reason the file was different than expected.h]hfThe resulting file may or may not be OK, depending on the reason the file was different than expected.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hThis 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.h]hThis 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.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hXRIf you get a message like ``Hunk #3 FAILED at 2387.``, then it means that the patch could not be applied correctly and the patch program was unable to 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 content that couldn't be changed.h](hIf you get a message like }(hjhhhNhNubj)}(h``Hunk #3 FAILED at 2387.``h]hHunk #3 FAILED at 2387.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh, then it means that the patch could not be applied correctly and the patch program was unable to fuzz its way through. This will generate a }(hjhhhNhNubj)}(h``.rej``h]h.rej}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh? file with the change that caused the patch to fail and also a }(hjhhhNhNubj)}(h ``.orig``h]h.orig}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubhB file showing you the original content that couldn’t be changed.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hIf you get ``Reversed (or previously applied) patch detected! Assume -R? [n]`` then patch detected that the change contained in the patch seems to have already been made.h](h If you get }(hjhhhNhNubj)}(hD``Reversed (or previously applied) patch detected! Assume -R? [n]``h]h@Reversed (or previously applied) patch detected! Assume -R? [n]}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh\ then patch detected that the change contained in the patch seems to have already been made.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hX!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, then you can say [**y**]es here to make patch revert it for you.h](hIf 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, then you can say [}(hjhhhNhNubj)}(h**y**h]hy}(hj hhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh)]es here to make patch revert it for you.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hThis 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.h]hThis 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.}(hj!hhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hX2A 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 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.h](hA message similar to }(hj/hhhNhNubj)}(h/``patch: **** unexpected end of file in patch``h]h+patch: **** unexpected end of file in patch}(hj7hhhNhNubah}(h]h ]h"]h$]h&]uh1jhj/ubh or }(hj/hhhNhNubj)}(h-``patch unexpectedly ends in middle of line``h]h)patch unexpectedly ends in middle of line}(hjIhhhNhNubah}(h]h ]h"]h$]h&]uh1jhj/ubhX 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 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.}(hj/hhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubh)}(hXAs 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 assume that either your patch file or your tree is broken and I'd advise you to start over with a fresh download of a full kernel tree and the patch you wish to apply.h]hXAs 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 assume that either your patch file or your tree is broken and I’d advise you to start over with a fresh download of a full kernel tree and the patch you wish to apply.}(hjahhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjvhhubeh}(h]common-errors-when-patchingah ]h"]common errors when patchingah$]h&]uh1hhhhhhhhKpubh)}(hhh](h)}(h(Are there any alternatives to ``patch``?h](hAre there any alternatives to }(hjzhhhNhNubj)}(h ``patch``h]hpatch}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjzubh?}(hjzhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhjwhhhhhKubh)}(hYes there are alternatives.h]hYes there are alternatives.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjwhhubh)}(hYou can use the ``interdiff`` program (http://cyberelk.net/tim/patchutils/) to generate a patch representing the differences between two patches and then apply the result.h](hYou can use the }(hjhhhNhNubj)}(h ``interdiff``h]h interdiff}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1jhjubh program (}(hjhhhNhNubh reference)}(h#http://cyberelk.net/tim/patchutils/h]h#http://cyberelk.net/tim/patchutils/}(hjhhhNhNubah}(h]h ]h"]h$]h&]refurijuh1jhjubha) to generate a patch representing the differences between two patches and then apply the result.}(hjhhhNhNubeh}(h]h ]h"]h$]h&]uh1hhhhKhjwhhubh)}(hThis will let you move from something like 5.7.2 to 5.7.3 in a single 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.h]hThis will let you move from something like 5.7.2 to 5.7.3 in a single 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.}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjwhhubh)}(h:Here's how you'd go from 5.7.2 to 5.7.3 in a single step::h]h=Here’s how you’d go from 5.7.2 to 5.7.3 in a single step:}(hjhhhNhNubah}(h]h ]h"]h$]h&]uh1hhhhKhjwhhubj&)}(h