Differences

This shows you the differences between two versions of the page.

--- 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 [2017/06/13 16:00]
Kalle Valo [Git branches] Fix spelling
@@ Line 1: / Line 1: @@
-o
 Go back --> [[en/users/Drivers/ath10k|ath10k]]
@@ Line 19: / Line 18: @@
 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.
+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.
+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.
 See also [[en/users/drivers/ath10k/submittingpatches|submitting ath10k patches]].
@@ Line 27: / Line 28: @@
 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 branch. Usually 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. 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 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 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.
+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.

Linux Wireless

User Tools

Site Tools

Differences

Page Tools