The recent commit 0ad4f8a4227ed7dd93fec99d33c6bb25056473fc for "LU-5275 lprocfs: remove last of non seq data structs and functions." breaks some lustre builds. In particular the problem comes from the renaming of the lustre internal routine lprocfs_try_remove_proc_entry() to remove_proc_subtree(). Newer linux kernels have their own exported remove_proc_subtree() API that conflicts. This is true in both the latest el6.6 kernel and the el7 kernel.

My first inclination was to add autoconf support for leaving out lustre's own remove_proc_subtree() if there is one in linux, but on careful examination it appears the linux instances aren't quite identical to the lustre implementation. I think the best course is to change the lustre routine back to its original name, so it won't conflict. I will push a patch to do so.

The only reason this hasn't shown up in current review builds is that it is only a problem in the newest el6.6 (not yet landed) and in server builds. We aren't doing el7 server builds yet.