| Weekly edition | Kernel | Security | Distributions | Search |
| Archives | Calendar | Subscribe | Write for LWN | LWN.net FAQ |
including vs. merging?
including vs. merging?
Posted Nov 16, 2004 4:10 UTC (Tue) by roelofs (subscriber, #2599)Parent article: Kernel release status
The biggest recent change in -mm, perhaps, is the inclusion of the four-level page table patch in 2.6.10-rc1-mm3 and subsequent fixes in -mm4; Andrew has stated that he expects to merge four-level page tables in the near future.
How does including the four-level page table patch differ from merging it/them? If the patch is included, isn't it merged already? (Or is that supposed to be a Linus comment?)
Greg
(Log in to post comments)
including vs. merging?
Posted Nov 16, 2004 4:23 UTC (Tue) by corbet (editor, #1) [Link]
"Merging" as in "merging into the mainline." One can say that the patch has been merged into -mm, but, in kernel jargon, "merge" usually refers to the mainline kernel. I suppose I could have been a bit more clear about that.
including vs. merging?
Posted Nov 16, 2004 15:50 UTC (Tue) by roelofs (subscriber, #2599) [Link]
Did I miss something? I didn't realize Andrew had taken over the mainline kernel already.