From: Oleg Drokin <green@xxxxxxxxxxxxxx> Due to a patch naming error this remainder of patches did not merge. Fixed the commit message to resolve this. lustresysctl code still stays in place and would be removed in a separate patch series. Additionally resolved a merge conflict with some other patch that touched lprocfs_exp_setup and made the lprocfs_exp_setup removal patch unmergeable. Dmitry Eremin (2): staging/lustre/obd: remove unused proc_lustre_root staging/lustre/obd: final removal of procfs stuff Oleg Drokin (4): staging/lustre/llite: Move all remaining procfs entries to debugfs staging/lustre/obd: Rename lprocfs_add_symlink to ldebugfs_add_symlink staging/lustre/obd: remove unused lprocfs_exp_setup() and related functions staging/lustre/obd: Remove nid_stats tracking .../lustre/include/linux/libcfs/linux/libcfs.h | 1 - drivers/staging/lustre/lustre/fid/Makefile | 3 +- drivers/staging/lustre/lustre/fld/Makefile | 3 +- drivers/staging/lustre/lustre/include/dt_object.h | 3 - .../lustre/lustre/include/linux/lustre_lite.h | 1 - drivers/staging/lustre/lustre/include/linux/obd.h | 10 +- .../staging/lustre/lustre/include/lprocfs_status.h | 257 +----------- drivers/staging/lustre/lustre/include/lu_object.h | 2 - .../staging/lustre/lustre/include/lustre_export.h | 29 -- drivers/staging/lustre/lustre/include/lustre_fid.h | 3 - drivers/staging/lustre/lustre/include/lustre_fld.h | 4 - drivers/staging/lustre/lustre/include/lustre_net.h | 6 - .../staging/lustre/lustre/include/lustre_quota.h | 241 ----------- drivers/staging/lustre/lustre/include/obd.h | 4 - drivers/staging/lustre/lustre/include/obd_class.h | 33 -- .../staging/lustre/lustre/include/obd_support.h | 41 -- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +- drivers/staging/lustre/lustre/libcfs/module.c | 1 - drivers/staging/lustre/lustre/llite/Makefile | 3 +- .../staging/lustre/lustre/llite/llite_internal.h | 26 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 13 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 48 ++- drivers/staging/lustre/lustre/llite/super25.c | 20 +- drivers/staging/lustre/lustre/llite/vvp_dev.c | 21 +- drivers/staging/lustre/lustre/lmv/Makefile | 3 +- drivers/staging/lustre/lustre/lmv/lmv_internal.h | 8 +- drivers/staging/lustre/lustre/lov/Makefile | 3 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 7 - drivers/staging/lustre/lustre/lov/lov_pool.c | 2 - drivers/staging/lustre/lustre/mdc/Makefile | 3 +- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_internal.h | 7 - drivers/staging/lustre/lustre/mgc/Makefile | 3 +- drivers/staging/lustre/lustre/mgc/mgc_internal.h | 11 - drivers/staging/lustre/lustre/mgc/mgc_request.c | 2 - drivers/staging/lustre/lustre/obdclass/Makefile | 4 +- drivers/staging/lustre/lustre/obdclass/class_obd.c | 37 +- drivers/staging/lustre/lustre/obdclass/dt_object.c | 6 - .../lustre/lustre/obdclass/linux/linux-module.c | 19 - .../lustre/lustre/obdclass/linux/linux-sysctl.c | 1 - .../lustre/lustre/obdclass/lprocfs_status.c | 447 +-------------------- drivers/staging/lustre/lustre/obdclass/lu_object.c | 4 - .../staging/lustre/lustre/obdclass/obd_config.c | 80 ---- drivers/staging/lustre/lustre/osc/Makefile | 3 +- drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +- drivers/staging/lustre/lustre/osc/osc_internal.h | 8 - drivers/staging/lustre/lustre/ptlrpc/Makefile | 3 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 5 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 12 - drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 8 +- 50 files changed, 121 insertions(+), 1346 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/lustre_quota.h -- 2.1.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel