en:users:drivers:ath10k:sources
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
|
en:users:drivers:ath10k:sources [2017/06/13 15:49] Kalle Valo Try to make the branch list more readable with bold |
en:users:drivers:ath10k:sources [2017/06/13 16:00] Kalle Valo [Git branches] Fix spelling |
||
|---|---|---|---|
| Line 29: | Line 29: | ||
| * **master:** The default branch selected when cloning the tree. Everyone working on any ath drivers (ath10k, ath9k, ath6kl etc) should use this branch as the baseline for patches. Follows Bob Copeland's wireless-testing tree and contains the latest -rc release from Linus Torvalds + latest wireless + latest ath patches from ath-next and ath-current branches. The branch is rebased every time it's updated. Due to unclean history bisect will not work, better to use ath-next (or ath-current) for bisecting. | * **master:** The default branch selected when cloning the tree. Everyone working on any ath drivers (ath10k, ath9k, ath6kl etc) should use this branch as the baseline for patches. Follows Bob Copeland's wireless-testing tree and contains the latest -rc release from Linus Torvalds + latest wireless + latest ath patches from ath-next and ath-current branches. The branch is rebased every time it's updated. Due to unclean history bisect will not work, better to use ath-next (or ath-current) for bisecting. | ||
| - | * **ath-next:** Based on Kalle's wireless-drivers-next tree and will be periodically merged to wireless-drivers-next and scheduled for the next release under works (not for the current -rc releases). ath patches are commited to this branch first and then merged to the master branch. For bisect runs it's better to use this branch instead of the master branch. | + | * **ath-next:** Based on Kalle's wireless-drivers-next tree and will be periodically merged to wireless-drivers-next and scheduled for the next release under works (not for the current -rc releases). ath patches are commited to this branch first and then merged to the master branch. For bisect runs it's better to use this branch instead of the master branch. All patches adding new features or low priority fixes go to this branch. |
| - | * **ath-current:** Based on Kalle's wireless-drivers tree and will be periodically merged to wireless-drivers and scheduled for the current release under works (for the upcoming -rc release). | + | * **ath-current:** Based on Kalle's wireless-drivers tree and will be periodically merged to wireless-drivers and scheduled for the current release under works (for the upcoming -rc release). Only critical fixes. |
| * **pending:** Used for building and runtime testing patches under review. Is rebased almost daily and hence commit ids are NOT stable. Use this only if you know what you are doing. | * **pending:** Used for building and runtime testing patches under review. Is rebased almost daily and hence commit ids are NOT stable. Use this only if you know what you are doing. | ||
| * **master-pending:** The pending branch merged on top of the master, for easier testing of the pending patches. Same rules apply as with the pending branch. | * **master-pending:** The pending branch merged on top of the master, for easier testing of the pending patches. Same rules apply as with the pending branch. | ||
| + | |||
| + | To clarify the meaning with ath-current and ath-next let's take a concrete example: let's say that the latest release from Linux is v4.9-rc2. If a patch is applied to ath-current it will most like be in v4.9-rc4 or v4.9-rc5 (usually it takes a minimum of one week to get to Linus' tree, sometimes more). But if the patch is applied to ath-next the first release it will be in is v4.10-rc1. | ||
en/users/drivers/ath10k/sources.txt · Last modified: 2021/03/06 06:06 by Kalle Valo
Page Tools
