3.4 Merge window part 1 [LWN.net]

3.4 Merge window part 1

Posted Mar 24, 2012 22:36 UTC (Sat) by cesarb (subscriber, #6266)
In reply to: 3.4 Merge window part 1 by djm1021
Parent article: 3.4 Merge window part 1

AFAIK, Corbet was not wrong. IIRC, ramster *was* removed, and added back again a few patches later.

to post comments

3.4 Merge window part 1

Posted Mar 25, 2012 16:38 UTC (Sun) by djm1021 (guest, #31130) [Link]

OK, I see what you mean. Actually, ramster *was* reverted just after it was merged into staging-next in early February (because it was dependent on xvmalloc which, coincidentally, had just been removed from staging-next) and then ramster was added back to staging-next soon after, and THEN disabled with CONFIG_BROKEN because it was dependent on a git pull ordering (cleancache fix) in linux-next. That sordid staging-next history was entirely merged into linux-next and into Linus's tree. So 3.4-rc0 never reverted ramster, although the git log might imply otherwise.

So we were both not wrong. ;-)

Now that all those dependencies are resolved in Linus's tree, a simple patch to remove the CONFIG_BROKEN in ramster's KConfig has been submitted and is awaiting merging for -rc1 via GregKH. Anyone wishing to try ramster in 3.4-rc0 can manually remove the CONFIG_BROKEN.