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 | ||
|
en:users:drivers:ath10k:sources [2017/06/12 19:03] Kalle Valo [ath10k sources] mention also about ath-current |
en:users:drivers:ath10k:sources [2021/03/06 06:06] (current) Kalle Valo [Git branches] add mhi-next |
||
|---|---|---|---|
| Line 18: | Line 18: | ||
| https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/tree/drivers/net/wireless/ath/ath10k | https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/tree/drivers/net/wireless/ath/ath10k | ||
| - | Periodically Kalle Valo merges ath-next and ath-current branches from ath.git into wireless-drivers-next and wireless-drivers tree, respectively. Then David Miller merges them to net-next and net trees, respectively, which are eventually merged by Linus Torvalds to the official kernel releases. | + | ===== Git branches ===== |
| - | As a rough estimate it takes patches in ath-next 2-4 months to propagate from ath.git to the next official Linux release and patches from ath-current 1-3 weeks to propagate to the next -rc release. | + | ath.git contains multiple branches: |
| - | See also [[en/users/drivers/ath10k/submittingpatches|submitting ath10k patches]]. | + | * **master:** The default branch selected when cloning the tree. Everyone working on any ath drivers (ath11k, ath10k, ath9k, ath6kl, wcn36xx, wil6210 etc) should use this branch as the baseline for patches and when testing submitted patches. Follows Bob Copeland's [[https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-testing.git/|wireless-testing tree]], which contains [[https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/|the latest -rc release]] from Linus Torvalds and latest wireless trees. On top of that latest ath patches are merged from [[https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/log/?h=ath-next|ath-next]] and [[https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/log/?h=ath-current|ath-current]] branches. Also latest [[https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git/log/?h=mhi-next|mhi-next]] is merged. 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. 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). 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. | ||
| + | * **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. | ||
| - | ===== Git branches ===== | + | See also [[en/users/drivers/ath10k/submittingpatches|submitting ath10k patches]] for more information about the patch flow. |
| - | + | ||
| - | ath.git contains multiple branches: | + | |
| - | * 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-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). | ||
| - | * 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. | ||
en/users/drivers/ath10k/sources.1497294202.txt.gz · Last modified: 2017/06/12 19:03 by Kalle Valo
Page Tools
