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:59] Kalle Valo [Git branches] Try to clarify more about the differences between -current and -next |
en:users:drivers:ath10k:sources [2017/06/14 07:58] Kalle Valo Move the -rc release example to submittingpatches page and remove duplicate information |
||
---|---|---|---|
Line 17: | 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 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]]. | ||
===== Git branches ===== | ===== Git branches ===== | ||
Line 34: | Line 28: | ||
* **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 it will be in v4.10-rc1. | + | See also [[en/users/drivers/ath10k/submittingpatches|submitting ath10k patches]] for more information about the patch flow. |