User Tools

Site Tools


en:users:drivers:ath10k:sources

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
en:users:drivers:ath10k:sources [2017/05/16 05:39]
Kalle Valo Refactor submitting patches to it's own page.
en:users:drivers:ath10k:sources [2018/05/29 13:29] (current)
Kalle Valo [Git branches] Use master branch also for testing
Line 1: Line 1:
-o 
 Go back --> [[en/​users/​Drivers/​ath10k|ath10k]] ​ Go back --> [[en/​users/​Drivers/​ath10k|ath10k]] ​
  
Line 18: Line 17:
  
 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 pulls the ath tree into wireless-drivers-next tree. Then David Miller pulls it to net-next which is eventually pulled by Linus Torvalds to official kernel releases. As a rough estimate it takes 2-4 months for a patch to propage from ath.git to an official Linux release. 
- 
-See also [[en/​users/​drivers/​ath10k/​submittingpatches|submitting ath10k patches]]. 
  
 ===== Git branches ===== ===== Git branches =====
Line 27: Line 22:
 ath.git contains multiple branches: ​ ath.git contains multiple branches: ​
  
-  * master ​ : The default branch selected when cloning the tree. Everyone working on ath10k ​(or ath6kl) should use this branch. Follows ​John Linville's wireless-testing tree and contains the latest -rc release from Linus Torvalds + latest wireless ​code from John + latest ​ath10k/​ath6kl code from ath-next ​branchUsually the branch is rebased ​after a merge window (after -rc1 is released). Due to unclean history bisect ​might not work, better to use ath-next 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 and when testing latest code. 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 branchesThe 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 John's wireless-next tree and John will pull from this branchath6kl/​ath10k ​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. 
-  * 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.  +  * **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. 
-  * 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.+  * **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. 
 + 
 +See also [[en/​users/​drivers/​ath10k/​submittingpatches|submitting ath10k patches]] for more information about the patch flow. 
en/users/drivers/ath10k/sources.1494913182.txt.gz · Last modified: 2017/05/16 05:39 by Kalle Valo