This shows you the differences between two versions of the page.
Both sides previous revision Previous revision | Next revision Both sides next revision | ||
en:users:drivers:ath10k:sources [2016/01/22 11:14] Kalle Valo ath.git is in kernel.org now |
en:users:drivers:ath10k:sources [2016/06/21 05:56] Kalle Valo Document master-pending branch |
||
---|---|---|---|
Line 72: | Line 72: | ||
* ath-next : Based on John's wireless-next tree and John will pull from this branch. ath6kl/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 John's wireless-next tree and John will pull from this branch. ath6kl/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. | ||
* 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. |