To get a relatively clean version of lustre client kernel code base, we can use a script to extract it from Lustre tree, and use external tools (like coan, http://coan2.sourceforge.net/index.php) to clean up macros generated by autoconfig.

Through the method, we can see from time to time how clean the code has got. And when it reaches to certain acceptable level, we can request to merge it in upstream staging tree.