Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revisionBoth sides next revision
submitting-patches [2017/10/25 12:59] murilobarixsubmitting-patches [2024/04/08 11:10] – [13. The canonical patch format] fix third example subject kanjimonster
Line 1: Line 1:
 ====== Submitting patches ====== ====== Submitting patches ======
 +See also:
 +  * [[docs:guide-developer:working-with-git-email|Sending patches by git send-email]]
 +  * If you are using GitHub, read also [[docs:guide-developer:working-with-github-pr|Working with GitHub]].
  
-Patches can be submitted as a pull request on Github or via the mailing list.\\ +=====Deciding where to send the patch===== 
  
-Submissions should follow the following guidelines:+  * **Patches to core packages and patches that add support for new devices** (i.e. code that is in [[https://git.openwrt.org/?p=openwrt/openwrt.git;a=summary|the main OpenWrt repository]] ) can be submitted as a pull request on [[https://github.com/openwrt/openwrt|the GitHub mirror]] or via the mailing list.
  
-  * use a different git branch for each pull request (GitHub does this automatically if you edit files through the website)+  * **Patches for LuCI web interface and related packages** can be submitted to mailing list or to the [[https://github.com/openwrt/luci/| Github mirror]] of the LuCI git repository.  Specific guidelines and hints for contributing to the //LuCI// repo may be found at [[https://github.com/openwrt/luci/blob/master/CONTRIBUTING.md| Contributing Guidelines]].
  
-  * write commit subject and message in the imperative form"add support for X", NOT "added support for X"+  * **Patches for community packages about routing** should go as a Github PR in the [[https://github.com/openwrt-routing/packages| OpenWrt community routing packages repo]].  Use the //packages// contributing guidelines below when contributing to the //routing// repo.
  
 +  * **Patches for community packages about telephony and SIP/VOIP** should go as a Github PR in the  [[https://github.com/openwrt/telephony| OpenWrt community telephony packages repo]].  Use the //packages// contributing guidelines below when contributing to the //telephony// repo.
 +
 +  * **Patches for miscellaneous community packages** should go as a Github PR in the [[https://github.com/openwrt/packages|OpenWrt community package repo]].  Specific guidelines and hints for contributing to the //packages// repo may be found at [[https://github.com/openwrt/packages/blob/master/CONTRIBUTING.md| Contributing Guidelines]].
 +
 +<WRAP round info 60%>
 +**If you want to add a new package that is not specific for a device** nor crucial to compile or use OpenWrt on a device, (i.e. tools, compilers, runtimes libraries, VPNs, media servers, backup servers and more), **open a PR in the appropriate community packages repository mentioned above.** Note that if you add a package you usually must assign yourself as "maintainer" of it.
 +</WRAP>
 + 
 +
 +===== Submission Guidelines =====
 +
 +Submissions should follow the following guidelines:
 +  * use a different git branch for each pull request (GitHub does this automatically when using web interface)
 +  * write commit subject and message in the imperative form: "add support for X", NOT "added support for X"
   * **code formatting**   * **code formatting**
     * use the same indentation you find in the file you are modifying, use only tabs or only spaces depending on what was done in the rest of the file     * use the same indentation you find in the file you are modifying, use only tabs or only spaces depending on what was done in the rest of the file
Line 28: Line 45:
     * must have less than 75 characters per line     * must have less than 75 characters per line
     * it will be committed to the source changelog, so __it should explain to a competent reader why you made this commit__.\\ Include symptoms of the failure you are fixing (log messages, error messages, etc.), it will be useful for\\ people searching the commit logs looking for a fix for their issue.\\ If a patch fixes a compile failure, include only the most relevant part of the failure log     * it will be committed to the source changelog, so __it should explain to a competent reader why you made this commit__.\\ Include symptoms of the failure you are fixing (log messages, error messages, etc.), it will be useful for\\ people searching the commit logs looking for a fix for their issue.\\ If a patch fixes a compile failure, include only the most relevant part of the failure log
-    * If you add support for new hardware: Include in your commit message a short description of the hardware and how to install LEDE on it. Have a look at the [[https://git.lede-project.org/?p=source.git&a=search&h=HEAD&st=commit&s=add+support+for|recent additions]] for some examples.+    * If you add support for new hardware: Include in your commit message a short description of the hardware and how to install OpenWrt on it. Have a look at the [[https://git.openwrt.org/?p=openwrt/openwrt.git&a=search&h=HEAD&st=commit&s=add+support+for|recent additions]] for some examples.
  
 +  * **all commits must contain ''%%Signed-off-by: My Name <my@email.address>%%'' where you write your real name or known identity and real email address**, in accordance with [[http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=HEAD#n416|Section 11 of the Linux Kernel patches guide]]
 +    * GitHub web interface or GUI application for git: you must append the ''Signed-off-by:'' line manually in the commit description
 +    * git command-line interface:
  
-  * **all commits must contain ''%%Signed-off-by: My Name <my@email.address>%%'' where you write your real name and real email address**, in accordance with [[http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=HEAD#n416|Section 11 of the Linux Kernel patches guide]]. +<code bash> 
-    * it can be done automatically by git commandline with: <code>git commit --signoff</code>+git commit --signoff 
 +</code> 
 + 
 +  * **the ''Author'' field must match the ''Signed-off-by:'' line** 
 +    * GitHub web interface: you must specify your real name or known identity in the ''Name'' field and the ''Primary email address'' to match the ''Signed-off-by:'' line 
 +    * git command-line interface:
  
-  * the Author field **must** match the "Signed-off-by:" line  +<code bash>
-    * if you are editing files and committing through GitHub, you must write your real name in the "Name" field in GitHub settings and the email used in the "Signed-off-by:" must be your primary github email +
-    * if you are editing files and committing on your local PC, set your name and email with<code>+
 git config --global user.name "my name" git config --global user.name "my name"
-git config --global user.email "my@email.address"</code>+git config --global user.email "my@email.address" 
 +</code>
  
 +===== Patch merging and tree life cycle =====
 +We encourage frequent committers to host their own staging trees where they aggregate patches that they feel responsible for and/or ones that they created themselves. Once the tree has been reviewed and tested it can be proposed for inclusion in the master branch.
 +  - Trees will be merged into master at any time
 +  - Bug fixes can be merged into master directly
 +  - PRs can be sent to the patches mailing list from any source and will always be considered for inclusion if the quality of the tree is good and format of submission is correct
 +  - Staging trees can be hosted as part of the projects git infrastructure, private servers, GitHub ...
 +===== Patch backports =====
 +Backporting refers to applying changes to a stable (release) branch like for example **openwrt-23.05** from the **main** branch. Since new features are not added to stable branches, backported changes are generally bug fixes and security fixes only. The process is roughly following:
 +  - Changes needs to be first applied into the **main** branch
 +  - Afterwards those changes can be proposed to be applied into the stable (release) branch
 +When pulling the commits from the **main** branch, you need to use ''git cherry-pick'' command with the ''-x'' argument and thus append a line that says ''(cherry picked from commit <commit>)'' to the original commit message ([[https://github.com/openwrt/openwrt/commit/59fd8f08cf544a7f0fcaf700ca9af9292de3adcc.patch|example]]) in order to indicate which commit this change was cherry-picked from. This is needed for traceability. It is also required that you add the ''--signoff'' to the commits, if you did not create the original commits.
 +<code bash>
 +$ git cherry-pick --signoff -x <commit>
 +</code>
 +===== Patch checklist =====
 +  - Single commit ( multiple commits must first be squashed, as described [[docs:guide-developer:working-with-github-pr#squashing_commits|here]]  )
 +  - Subject < 50 characters
 +  - Blank line after subject
 +  - Each line of description < 75 characters
 +  - Description explains **what** was changed
 +  - Description explains **why** it was changed  
 +  - Description makes sense
 +  - Signoff line includes real name or known identity
 +  - Signoff line includes real email address
 +  - If it's a third-party patch, then preserve Signoff line from the original author
 +  - Sender/Author name and email address matches Signoff line's real name or known identity and email address 
  
-===== Working with Github =====+===== DTS checklist ===== 
 +  - Don't forget to add proper license, consider adding ''SPDX-License-Identifier: GPL-2.0-or-later OR MIT'' ([[https://github.com/openwrt/openwrt/commit/221d3e023451cad0b60b8a47e8b788d6368108c2#diff-7ecb7639c5199e391573618b0e444894|details]]) 
 +  - Remove all ocurrencies of ''default-state = "off"'' properties under your LED nodes ([[https://github.com/openwrt/openwrt/commit/0d23fd2ab29a66f5d03187db4fac3e396b4f3b62|details]]) 
 +  - If you're adding MTD flash layout, and you've ''label = "firmware"'' or a node with the name ''firmware@xyz'', please check that you've added proper ''compatible'' property (if applicable) ([[https://github.com/openwrt/openwrt/pull/1586/commits/22c1d69e63a3e80c41baf3941d5e6deb2019d039|details]]) 
 +  - If it's possible try to dedicate some of the LEDs for system status indication in [[https://github.com/openwrt/openwrt/blob/master/package/base-files/files/etc/diag.sh|diag.sh]] ([[https://github.com/openwrt/openwrt/blob/master/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi#L7|example]]) 
 +  - The name of a node should reflect the function of the device and not its model. Examples for generic node names can be found in Section [[https://github.com/devicetree-org/devicetree-specification/blob/master/source/devicetree-basics.rst#generic-names-recommendation|2.2.2 Generic Names Recommendation]] 
 +  - Remove all [[https://github.com/devicetree-org/devicetree-specification/blob/master/source/devicetree-basics.rst#device_type-deprecated|deprecated "device_type"]] properties, unless for "memory" or "cpu" nodes
  
-There are Github mirrors of the source repository [[https://github.com/lede-project/source|here]].\\  +An overview of non-mandatory guidelines for device support submissions is provided in [[docs:guide-developer:device-support-policies|Device support policies / best practices]] 
-Fork the project to a public repo using Github web interface, clone the repo to your computer, create a branch for your changes, push these back to Github and submit a pull request.+===== In-depth process of preparing and submitting code to OpenWrt ===== 
 +Based on [[https://www.kernel.org/doc/html/latest/process/submitting-patches.html|​Linux Kernel patch submission guidelines]].
  
-In case you don't know how to do thatkeep reading.\\+OpenWrt is constantly being improved. We'd like as many people to contribute to this as we can get. If you find a change usefulby all means try to get it incorporated into the project. This should improve OpenWrt and it should help carry your changes forward into future versions.
  
-Create Github accountthis will host your public fork of LEDE source, and will be used for all interaction on Github.+For person or company who wishes to submit a change to OpenWrtthe process can sometimes be daunting if you're not familiar with "the system." This text is a collection of suggestions which can greatly increase the chances of your change being accepted. 
 + 
 +It is important to do all these steps repeatedly: 
 +  * Listen to what other people think. 
 +  * Explain what problem you are addressing and your proposed solution. 
 +  * Write useful patches including documentation. 
 +  * Test, test, test. 
 + 
 +Where to listen and talk: 
 +  * Google to find things related to your problem 
 +  * [[:start|OpenWrt wiki]] 
 +  * ​[[:contact#mailing_lists|Mailing Lists]] 
 +  * [[:contact#irc_channels|IRC]] 
 +  * [[https://forum.openwrt.org|OpenWrt Forum]] 
 +  * GitHub - ​https://github.com/openwrt/openwrt - trunk development and bugtracking 
 +  * (archived) TRAC - ​​https://dev.openwrt.org/ - the issue/bug/change tracking system. (TRAC is closed now, and only kept for archiving purposes.) 
 + 
 +===== Documentation ===== 
 +It is often best to document what you are doing before you do it. The process of documentation often exposes possible improvements. Keep your documentation up to date. 
 + 
 +===== Creating and sending your change ===== 
 +Read [[:submitting-patches#patch_checklist|Submit Checklist]] for a list of items to check before submitting code. 
 + 
 +For patches against external package sources, refer to the quilt howto at [[docs:guide-developer:toolchain:use-patches-with-buildsystem]] 
 + 
 +Please read ​[[https://www.kernel.org/doc/html/v4.11/process/email-clients.html|Email clients for patches]] to find out how to make sure your email client doesn't destroy your patch. 
 + 
 +==== 1. Creating a patch ===== 
 +All changes to OpenWrt occur in the form of patches. 
 + 
 +Patches should be based in the root trunk, not in any lower subdirectory. 
 + 
 +Make sure your patch does not include any extra files which do not belong in a patch submission. 
 +Be sure to review your patch **after** you have generated it, to ensure accuracy. 
 + 
 +If your changes produce a lot of deltas, you may want to look into splitting them into individual patches which modify things in logical stages. 
 +This will facilitate easier reviewing by other OpenWrt developers, which is very important if you want your patch to be accepted. 
 + 
 +The tools you can use to create a patch, in order of preference, are: 
 +   * Git 
 +   * SVN 
 +   * diff 
 + 
 +To ease integration of smaller patches into trunk, developers can also make pull-requests into the GitHub trunk tree - this is an addition over the earlier patchwork workflow. 
 +Larger patches, or patches that require further discussion, should still be sent to the **openwrt-devel** list, where they'll be commented upon, and committed into trunk at some point. 
 + 
 +==== 2. Describe your changes ===== 
 +Describe the technical detail of the change(s) your patch includes. 
 + 
 +Be as specific as possible. The WORST descriptions possible include things like "changes for package X", "bug fix for package X", or "this patch includes updates for platform X. Please apply." 
 + 
 +The maintainer will thank you if you write your patch description in a form which can be used unmodified as a commit message for OpenWrt source code management system. See par.13, below. 
 + 
 +If your description starts to get long, that's a sign that you probably need to split up your patch. See par.3, next. 
 + 
 +When you submit or resubmit a patch or patch series, include the complete patch description and justification for it. Don't just say that this is version N of the patch (series). Don't expect the patch merger to refer back to earlier patch versions or referenced URLs to find the patch description and put that into the patch. I.e., the patch (series) and its description should be self-contained. This benefits both the patch merger(s) and reviewers. Some reviewers probably didn't even receive earlier versions of the patch. 
 + 
 +If the patch fixes a logged bug trac entry, refer to that bug entry by number. 
 + 
 +==== 3. Separate your changes ===== 
 +Separate __logical changes__ into a single patch file. 
 + 
 +For example, if your changes include both bug fixes and enhancements for a single package, separate those changes into two or more patches. 
 + 
 +On the other hand, if you make a single change to numerous files, group those changes into a single patch. Thus a single logical change is contained within a single patch. 
 + 
 +If one patch depends on another patch in order for a change to be complete, that is OK. Simply note "this patch depends on patch X" in your patch description. 
 + 
 +If you cannot condense your patch set into a smaller set of patches, then only post say 15 or so at a time and wait for review and integration. 
 + 
 +==== 4. Style check your changes ===== 
 +Check your patch for basic style violations. Failure to do so simply wastes the reviewer's time and will get your patch rejected, probably without even being read. 
 + 
 +==== 5. Select email destination ===== 
 +Look in the Makefile if a MAINTAINER macro exists. If so, email that person. Unless you have a reason NOT to do so, always CC openwrt-devel <at> lists.openwrt.org. If no maintainer is listed, send your patch to the [[https://lists.openwrt.org/mailman/listinfo/openwrt-devel|​primary OpenWrt developer's mailing list]]. Most OpenWrt developers monitor this email list, and can comment on your changes. 
 + 
 +==== 6. No MIME, no links, no compression, no attachments, just plain text ===== 
 +OpenWrt developers need to be able to read and comment on the changes you are submitting. It is important for an OpenWrt developer to be able to "quote" your changes, using standard email tools, so that they may comment on specific portions of your code. 
 + 
 +For this reason, all patches should be submitting email "inline". WARNING: Be wary of your editor's word-wrap corrupting your patch, if you choose to cut-n-paste your patch. 
 + 
 +Do not attach the patch as a MIME attachment, compressed or not. Many popular email applications will not always transmit a MIME attachment as plain text, making it impossible to comment on your code. 
 + 
 +Exception: If your mailer is mangling patches then someone may ask you to re-send them using MIME. 
 + 
 +Mozilla Thunderbird requires that you change email defaults to send plain text email. 
 +read [[http://kb.mozillazine.org/Plain_text_e-mail_%28Thunderbird%29|Plain text email - Thunderbird]] 
 +:!: disable flowed text 
 + 
 +==== 7. Email size ===== 
 +Large changes are not appropriate for mailing lists, and some maintainers. If your patch, uncompressed, exceeds 300 kB in size, it is preferred that you store your patch on an Internet-accessible server, and provide instead a URL (link) pointing to your patch. 
 + 
 +==== 8. Remain objective, re-submit ===== 
 + 
 +It's nothing personal. Code should work well for its intended purpose and results should adhere to many standards and requirements, so finding problems early is a good thing.  
 + 
 +After you have submitted your change, be patient and wait. If developers like your change and apply it, it will appear as new revision in the source code management system. 
 + 
 +However, if your change doesn't appear in the source code management system, there could be any number of reasons. It's YOUR job to narrow down those reasons, correct what was wrong, and submit your updated change. 
 + 
 +Sometimes, developers may "drop" your patch with or without comment. That's the nature of the system. If your patch is dropped, it could be due to: 
 +   * Your patch did not apply cleanly to the latest OpenWrt revision. 
 +   * Your patch was not sufficiently discussed on openwrt-devel. 
 +   * A style issue. 
 +   * An email formatting issue (re-read this section). 
 +   * A technical problem with your change. 
 +   * They get tons of email, and yours got lost in the shuffle. 
 +   * You are being annoying. 
 + 
 +When in doubt, solicit comments on openwrt-devel mailing list. 
 + 
 +==== 9. Include PATCH in the subject ===== 
 +Due to high email traffic to openwrt-devel, it is common convention to prefix your subject line with [PATCH]. This lets OpenWrt developers more easily distinguish patches from other email discussions, and will also make its way to the patchwork automatically. 
 + 
 +==== 10. Sign your work ===== 
 +To provide tracking of who did what, we use a "sign-off" procedure on patches that are being emailed around. 
 + 
 +The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as an open-source patchThe rules are pretty simple: if you can certify the below:
  
-Install git in your PC, and make sure that your local git settings have the right name and email\\ 
 <code> <code>
-git config --global user.name "my name" +Developer's Certificate of Origin 1.
-git config --global user.email "my@email.address"+ 
 +By making a contribution to this project, I certify that: 
 + 
 +(a) The contribution was created in whole or in part by me and I 
 +    have the right to submit it under the open source license 
 +    indicated in the file; or 
 + 
 +(b) The contribution is based upon previous work that, to the best 
 +    of my knowledge, is covered under an appropriate open source 
 +    license and I have the right under that license to submit that 
 +    work with modifications, whether created in whole or in part 
 +    by me, under the same open source license (unless I am 
 +    permitted to submit under a different license), as indicated 
 +    in the file; or 
 + 
 +(c) The contribution was provided directly to me by some other 
 +    person who certified (a), (b) or (c) and I have not modified 
 +    it. 
 + 
 +(d) I understand and agree that this project and the contribution 
 +    are public and that a record of the contribution (including all 
 +    personal information I submit with it, including my sign-off) is 
 +    maintained indefinitely and may be redistributed consistent with 
 +    this project or the open source license(s) involved.
 </code> </code>
  
-You might also want to set the default text editor to your favourite editor. +then you just add a line saying
-If you have Linux system with a GUI, some choices are **geany**, **kwrite**, **pluma** and **gedit**.\\  +
-If you are using command line, **nano** is a good one. <code>git config --global core.editor "editor-name-here"</code>+
  
-Then follow Github's excellent documentation to [[https://help.github.com/articles/fork-a-repo/|Fork A Repo]] and [[https://help.github.com/articles/fork-a-repo/#step-2-create-a-local-clone-of-your-fork|Create a local clone of your fork]]\\+<code bash> 
 +Signed-off-byRandom J Developer <random@developer.example.org> 
 +</code>
  
-After you have set it up as described, write <code>git checkout -b my-new-branch-name</code> to create branch for your PR ("my-new-branch-name" is just an example nameuse a more descriptive name in yours).\\  +using known identity (sorryno anonymous contributions.)
-All commits you do after this command will be grouped in this branch. This allows to have multiple branches, one for each PR.\\ +
-To switch between branches you already created, use <code>git checkout my-branch-name</code>+
  
-After you made your changeswrite <code>git add -i</code> and use its interface to add untracked (newfiles and update existing ones.\\+If you are a package or target maintainersometimes you need to slightly modify patches you receive in order to merge them, because the code is not exactly the same in your tree and the submitters'. If you stick strictly to rule (c), you should ask the submitter to rediff, but this is a totally counter-productive waste of time and energy. Rule (b) allows you to adjust the code, but then it is very impolite to change one submitter's code and make them endorse your bugs. To solve this problem, it is recommended that you add a line between the last Signed-off-by header and yours, indicating the nature of your changes. While there is nothing mandatory about this, it seems like prepending the description with your mail and/or name, all enclosed in square brackets, is noticeable enough to make it obvious that you are responsible for last-minute changesExample :
  
-Then write <code>git commit --signoff</code> This will open the git default editor and you can write the commit message. \\  +<code bash
-The first line is the commit subject, \\  +Signed-off-by: Random J Developer <random@developer.example.org> 
-then leave an empty line \\  +[lucky@maintainer.example.orgstruct foo moved from foo.c to foo.h] 
-then you write the commit description. \\ +Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org> 
-This command will automatically add the Signed-off-by line with your name and email as set above.\\ +</code>
-For example, a complete commit message might look like this:\\  +
-  The best code update. +
-   +
-  This is the best piece of code I have ever submitted+
-  Signed-off-by: John Doe <John.Doe@test.com>+
  
-To send your local changes over to your Github repowrite <code>git push --all</code> +This practice is particularly helpful if you maintain a stable branch and want at the same time to credit the author, track changes, merge the fix, and protect the submitter from complaints. Note that under no circumstances can you change the author's identity (the From header), as it is the one which appears in the changelog.
-You will be asked your github user and password in the process.\\+
  
-After the code has been uploaded to your github repo, you can submit PR using Github web interface, see again Github's documentation about [[https://help.github.com/articles/creating-a-pull-request/|Creating pull request]]\\+Special note to back-porters: It seems to be common and useful practise to insert an indication of the origin of patch at the top of the commit message (just after the subject line) to facilitate tracking. For instance:
  
 +<code bash>
 +Date:   Wed Jul 25 15:14:50 2012 +0300
 +    [generic] add missing symbols
 +    [backport r12345]
 +</code>
  
-===== Sending patches by Email =====+Whatever the format, this information provides valuable help to people tracking your trees, and to people trying to trouble-shoot bugs in your tree.
  
-Send an email to the [[https://lists.infradead.org/mailman/listinfo/lede-dev|development mailing list]]. All patches need to be sent in the same format as those that are listed on [[https://patchwork.ozlabs.org/project/lede/list/|patchwork]]. If the patch does not get listed in patchwork then it won't get processed. +For the more convenient developers, git can automatically add a sign-off:
-Using **git send-email** is warmly recommended, as email clients tend to add spaces and screw up the formatting or add non-printable characters. +
  
-===== Squashing commits ===== +<code bash> 
-Commits in a PR or sent by email should be about full changes you want to merge, not about fixing all issues the reviewers found in your original PR.\\+git commit -s 
 +</code>
  
-So, there will come a time when you will need to either rewrite or squash your commits; so you end with a normal amount of true and sane commits.+==== 11. When to use "Acked-by:" and "Cc:" ===== 
 +The Signed-off-by: tag indicates that the signer was involved in the development of the patch, or that they were in the patch's delivery path.
  
-Work with git commandline.\\  +If a person was not directly involved in the preparation or handling of a patch but wishes to signify and record their approval of it then they can arrange to have an Acked-byline added to the patch's changelog.
-Change to your development folder.\\  +
-Look at the branches you have with: <code>git branch -a</code> +
-get something like:<code> +
-  best_code_update +
-* master</code>+
  
-Switch to the your development branch for this PR with:<code>git checkout best_code_update</code>+Acked-byis often used by the maintainer of the affected code when that maintainer neither contributed to nor forwarded the patch.
  
-Look at the git logso you can count the number of commits you want to squash ( the "Xbelow ) with:<code>git log</code>+Acked-by: is not as formal as Signed-off-by:. It is a record that the acker has at least reviewed the patch and has indicated acceptance. Hence patch mergers will sometimes manually convert an acker's "yeplooks good to meinto an Acked-by:.
  
-Delete commits with:<code>git reset HEAD~X</code> +Acked-bydoes not necessarily indicate acknowledgement of the entire patch. For exampleif a patch affects multiple packages and has an Acked-byfrom one package maintainer then this usually indicates acknowledgement of just the part which affects that maintainer'code. Judgment should be used here.
-(where X is the number of commits you want to delete, counted from the last commit)this will not change modified files, it will only delete the commits.\\ +
-Add the files to git tracking again with:<code>git add -i</code> +
-and commit again with:<code>git commit --signoff</code> +
-Send the updated branch over to github with: <code>git push -f</code>  +
-and the commits in the PR will be updated automatically.+
  
-==== Alternative squashing advice====+If a person has had the opportunity to comment on a patch, but has not provided such comments, you may optionally add a "Cc:" tag to the patch. This is the only tag which might be added without an explicit action by the person it names. This tag documents that potentially interested parties have been included in the discussion.
  
-You can use **interactive rebase** to combinereorder and edit your commits and their commit messages, with:<code>git rebase -i HEAD~X</code>   (X number of commits to edit)+==== 12. Using "Reported-by:""Tested-by:" and "Reviewed-by:" ===== 
 +If this patch fixes a problem reported by somebody else, consider adding a Reported-by: tag to credit the reporter for their contribution. Please note that this tag should not be added without the reporter's permission, especially if the problem was not reported in a public forum. That said, if we diligently credit our bug reporters, they will, hopefully, be inspired to help us again in the future.
  
-===== Patch Merging And Tree Life Cycle =====+A Tested-by: tag indicates that the patch has been successfully tested (in some environment) by the person named. This tag informs maintainers that some testing has been performed, provides a means to locate testers for future patches, and ensures credit for the testers.
  
-We encourage frequent committers to host their own staging trees where they aggregate patches that they feel responsible for and/or ones that they created themselves. Once the tree has been reviewed and tested it can be proposed for inclusion in the master branch.+Reviewed-by:, instead, indicates that the patch has been reviewed and found acceptable according to the Reviewer's Statement:
  
 +<code>
 +Reviewer's statement of oversight
  
-  Trees will be merged into master at any time +By offering my Reviewed-by: tag, I state that: 
-  Bug fixes can be merged into master directly + 
-  PRs can be sent to the patches mailing list from any source and will always be considered for inclusion if the quality of the tree is good and format of submission is correct +(a) I have carried out a technical review of this patch to 
-  - Staging trees can be hosted as part of the projects git infrastructureprivate serversGitHub ...+    evaluate its appropriateness and readiness for inclusion into 
 +    OpenWrt. 
 + 
 +(b) Any problems, concerns, or questions relating to the patch 
 +    have been communicated back to the submitter. I am satisfied 
 +    with the submitter's response to my comments. 
 + 
 +(c) While there may be things that could be improved with this 
 +    submission, I believe that it is, at this time, (1) a 
 +    worthwhile modification to OpenWrt, and (2) free of known 
 +    issues which would argue against its inclusion. 
 + 
 +(d) While I have reviewed the patch and believe it to be sound, I 
 +    do not (unless explicitly stated elsewhere) make any 
 +    warranties or guarantees that it will achieve its stated 
 +    purpose or function properly in any given situation. 
 +</code> 
 + 
 +A Reviewed-by tag is a statement of opinion that the patch is an appropriate modification of OpenWrt without any remaining serious technical issues. Any interested reviewer (who has done the work) can offer a Reviewed-by tag for a patch. This tag serves to give credit to reviewers and to inform maintainers of the degree of review which has been done on the patch. Reviewed-by: tags, when supplied by reviewers known to understand the subject area and to perform thorough reviews, will normally increase the likelihood of your patch getting into OpenWrt. 
 + 
 +==== 13. The canonical patch format ===== 
 +The canonical patch subject line is: 
 + 
 +<code bash> 
 +Subject: [PATCH 001/123] [section] summary phrase 
 +</code> 
 + 
 +The canonical patch message body contains the following: 
 +   * A "from" line specifying the patch author. 
 +   * An empty line. 
 +   * The body of the explanation, which will be copied to the permanent changelog to describe this patch. 
 +   * The "Signed-off-by:" lines, described above, which will also go in the changelog. 
 +   * A marker line containing simply ''%%---%%''
 +   * Any additional comments not suitable for the changelog. 
 +   * The actual patch (diff output). 
 + 
 +The Subject line format makes it very easy to sort the emails alphabetically by subject line - pretty much any email reader will support that - since because the sequence number is zero-padded, the numerical and alphabetic sort is the same. 
 + 
 +The "section" in the email's Subject should identify which section of OpenWrt is being patched. Some example sections are: 
 +   * [a specific target name] 
 +   * [a specific package name] 
 + 
 +The "summary phrase" in the email's Subject should concisely describe the patch which that email contains. The "summary phrase" should not be a filename. Do not use the same "summary phrase" for every patch in a whole patch series (where a "patch series" is an ordered sequence of multiple, related patches). 
 + 
 +Bear in mind that the "summary phrase" of your email becomes a globally-unique identifier for that patch. It propagates all the way into the source code management system changelog. The "summary phrase" may later be used in developer discussions which refer to the patch. People will want to google for the "summary phrase" to read discussion regarding that patch. It will also be the only thing that people may quickly see when, two or three months later, they are going through perhaps thousands of patches using source code management browsing tools. 
 + 
 +For these reasons, the "summary" must be no more than 70-75 characters, and it must describe both what the patch changes, as well as why the patch might be necessary. It is challenging to be both succinct and descriptive, but that is what a well-written summary should do. 
 + 
 +The "summary phrase" may be prefixed by tags enclosed in square brackets: "Subject: [PATCH tag] <summary phrase>". The tags are not considered part of the summary phrase, but describe how the patch should be treated. Common tags might include a version descriptor if the multiple versions of the patch have been sent out in response to comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for comments. If there are four patches in a patch series the individual patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures that developers understand the order in which the patches should be applied and that they have reviewed or applied all of the patches in the patch series. 
 + 
 +Some example Subjects: 
 + 
 +<code bash> 
 +Subject: [PATCH] e2fsprogs: Bump to 1.41.3 
 + 
 +Subject: [PATCH] x86 generic: switch to 3.3 
 + 
 +Subject: [PATCH v2 001/207] ar71xx: enable sysupgrade on the WRT160Nl 
 +</code> 
 + 
 +The "from" line must be the very first line in the message body, and has the form: 
 + 
 +<code bash> 
 +From: Original Author <author@example.com> 
 +</code> 
 + 
 +The "from" line specifies who will be credited as the author of the patch in the permanent changelog. If the "from" line is missing, then the "From:" line from the email header will be used to determine the patch author in the changelog. 
 + 
 +The explanation body will be committed to the permanent source changelog, so should make sense to a competent reader who has long since forgotten the immediate details of the discussion that might have led to this patch. Including symptoms of the failure which the patch addresses (kernel log messages, oops messages, etc.) is especially useful for people who might be searching the commit logs looking for the applicable patch. If a patch fixes a compile failure, it may not be necessary to include _all_ of the compile failures; just enough that it is likely that someone searching for the patch can find it. As in the "summary phrase", it is important to be both succinct as well as descriptive. 
 + 
 +The ''%%---%%'' marker line serves the essential purpose of marking for patch handling tools where the changelog message ends. 
 + 
 +One good use for the additional comments after the ''%%---%%'' marker is for a diffstat, to show what files have changed, and the number of inserted and deleted lines per file. A diffstat is especially useful on bigger patches. Other comments relevant only to the moment or the maintainer, not suitable for the permanent changelog, should also go here. A good example of such comments might be "patch changelogs" which describe what has changed between the v1 and v2 version of the patch. 
 + 
 +See more details on the proper patch format in the following References. 
 + 
 +===== Monitoring patches ===== 
 +Patches sent to the Development mailing list can be followed on Patchwork at ​[[https://patchwork.ozlabs.org/project/openwrt/list/]]. 
 + 
 +===== References ====== 
 +   * Andrew Morton"The perfect patch" (tpp). 
 +      * ​http://userweb.kernel.org/~akpm/stuff/tpp.txt 
 +   * Jeff Garzik"Linux kernel patch submission format". 
 +      * ​http://linux.yyz.us/patch-format.html 
 +   * Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer"
 +      * ​http://www.kroah.com/log/linux/maintainer.html 
 +      * ​http://www.kroah.com/log/linux/maintainer-02.html 
 +      * ​http://www.kroah.com/log/linux/maintainer-03.html 
 +      * ​http://www.kroah.com/log/linux/maintainer-04.html 
 +      * ​http://www.kroah.com/log/linux/maintainer-05.html 
 +   * NO!!!! No more huge patch bombs to linux-kernel@… people! 
 +      * ​http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2 
 +   * Linus Torvalds's mail on the canonical patch format: 
 +      * ​​http://lkml.org/lkml/2005/4/7/183 
 +   * Andi Kleen, "On submitting kernel patches" 
 +      * Some strategies to get difficult or controversial changes in. 
 +      * ​http://halobates.de/on-submitting-patches.pdf 
 + 
 +===== Additional information ===== 
 +  * Be aware of line length limit (80). 
 +  * Use ''./scripts/checkpatch.pl'' to check your patch - there might be false positives.
  
-===== Patch Checklist ===== 
-  - Single commit ( multiple commits must first be squashed, as described above ) 
-  - Subject < 50 characters 
-  - Blank line after subject 
-  - Each line of description < 75 characters 
-  - Description explains **what** was changed 
-  - Description explains **why** it was changed   
-  - Description makes sense 
-  - Signoff line includes real name 
-  - Signoff line includes real email address 
  • Last modified: 2024/12/06 16:55
  • by wertwert4pda