Documentation/process/backporting.rst

31 in which case you just cherry-pick it directly using
32 ``git cherry-pick``. However, if the patch comes from an email, as it
42 where the patch applies cleanly and *then* cherry-pick it over to your
47 can apply it to the most recent mainline kernel and then cherry-pick it
57 A good reason to prefer ``git cherry-pick`` over ``git am`` is that git
67 article will assume that you are doing a plain ``git cherry-pick``.
72 Once you have the patch in git, you can go ahead and cherry-pick it into
73 your source tree. Don't forget to cherry-pick with ``-x`` if you want a
89 Uh-oh; the cherry-pick failed with a vaguely threatening message::
104 If your attempted cherry-pick fails with a conflict, git automatically
239 to stop and cherry-pick that instead. If you've already resolved some
243 To abort the current cherry-pick, go ahead and run
244 ``git cherry-pick --abort``, then restart the cherry-picking process
400   git cherry-pick -strategy=recursive -Xrename-threshold=30
406 attempt to cherry-pick the patch, rename the file back (``git mv`` and
428 If you cherry-pick a patch that includes a ``goto`` statement (typically
541 cherry-pick the second patch, have no conflicts, and believe that
555 As the stable maintainers try to cherry-pick mainline fixes onto their
559 These emails typically include the exact steps you need to cherry-pick