This shows you the differences between two versions of the page.
Both sides previous revision Previous revision | |||
en:users:drivers:ath10k:submittingpatches [2024/07/08 16:22] Jeff Johnson [Submitting patches] |
en:users:drivers:ath10k:submittingpatches [2024/07/08 16:24] (current) Jeff Johnson [Patch flow] |
||
---|---|---|---|
Line 92: | Line 92: | ||
The ath10k patch flow is this: | The ath10k patch flow is this: | ||
* Patch gets posted to the mailing lists. | * Patch gets posted to the mailing lists. | ||
- | * Kalle applies ASAP (usually can take 1-3 business days) the patch to pending and master-pending branches for build testing. | + | * Kalle applies ASAP (usually can take 1-3 business days) the patch to pending and main-pending branches for build testing. |
* Kalle waits minimum of two business days for patch being under review (unless the patch is urgent). | * Kalle waits minimum of two business days for patch being under review (unless the patch is urgent). | ||
* If no comments or warnings, Kalle applies the patch either to ath-current branch (for critical fixes) or to ath-next branch (new features, low priority fixes) and sends a "Thanks, applied" reply. | * If no comments or warnings, Kalle applies the patch either to ath-current branch (for critical fixes) or to ath-next branch (new features, low priority fixes) and sends a "Thanks, applied" reply. | ||
- | * Kalle merges ath-next and ath-current to master branch immeadiately after the patch is applied. | + | * Kalle merges ath-next and ath-current to main branch immediately after the patch is applied. |
* Kalle merges ath-next into wireless-drivers-next tree and ath-current to wireless-drivers tree roughly every 2-3 weeks. | * Kalle merges ath-next into wireless-drivers-next tree and ath-current to wireless-drivers tree roughly every 2-3 weeks. | ||
* David Miller merges wireless-drivers-next into net-next tree and wireless-drivers to net tree every two weeks or so. | * David Miller merges wireless-drivers-next into net-next tree and wireless-drivers to net tree every two weeks or so. |