Paolo Bonzini <bonzini@gnu.org> writes:Topics meant for master are always forked at the tip of master (or older) and they are merged back to master when they prove Ok. Topics that are fixes are forked at maint (or older) and if they are trivial they are merged straight to maint and gets merged up to master. Otherwise they are merged to next, cooked for a while, then merged to master, cooked even more, and then finally merged to maint. Of course, I am not perfect (I said I am not Linus, didn't I?) and do not have perfect foresight, so sometimes I do a fix directly on 'master' and realize it should also apply to 'maint' some time later. They need to be cherry-picked. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Heiko Carstens | Re: -mm merge plans for 2.6.23 -- sys_fallocate |
| Linus Torvalds | Linux 2.6.21-rc4 |
| Michael Kerrisk | nanosleep() uses CLOCK_MONOTONIC, should be CLOCK_REALTIME? |
| Linus Torvalds | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
git: | |
| Gary Thomas | Marvell 88E609x switch? |
| Gerrit Renker | [PATCH 15/37] dccp: Set per-connection CCIDs via socket options |
| David Miller | [GIT]: Networking |
| David Miller | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
