简体   繁体   English

Linux内核的稳定git分支是否合并回主服务器?

[英]Are the Linux kernel's stable git branches merged back into master?

My understanding is that in the Linux kernel bug fixes are cherry-picked from the master branch into the stable branches (ie to backport a bugfix). 我的理解是,在Linux内核中,错误修复是从主分支到稳定分支的挑选(即向后端移植错误修复)。 Are those branches then merged back into master again? 那些分支然后又合并回主人吗?

No, they are not, They wouldn't contribute anything new to master anyway would they? 不,他们不是,他们不会为他们提供任何新的东西吗?

You can check yourself 你可以检查自己

git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
git remote add stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
git fetch stable
gitk -n 50000 stable/linux-3.11.y stable/linux-3.10.y master

Navigating single commits is too tedious, but using the "Follows" hyperlinks you can get reasonably easily down to eg 3.10 and then using "Precedes" up the 3.10.12 again (For 3.11 it's and its stable branch it's even shorter). 导航单个提交过于繁琐,但使用“跟随”超链接可以合理轻松地降低到例如3.10然后再次使用“Precedes”上升到3.10.12(对于3.11它和它的稳定分支它甚至更短)。 You'll see the that stable branches involve no merging in either direction. 你会看到稳定的分支不涉及任何方向的合并。

Should you get lost use history buttons (arrows) right of the SHA1 field to get back where you came from. 如果您迷路了,请使用SHA1字段右侧的历史记录按钮(箭头)返回您的来源。

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM