The patch titled drivers/edac: mod edac_opt_state_to_string function has been removed from the -mm tree. Its filename was driver-edac-mod-edac_opt_state_to_string-function.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/edac: mod edac_opt_state_to_string function From: Douglas Thompson <dougthompson@xxxxxxxxxxxx> Refactored the function edac_op_state_toString() to be edac_op_state_to_string() for consistent style, and its callers Signed-off-by: Douglas Thompson <dougthompson@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/edac/edac_core.h | 2 +- drivers/edac/edac_device.c | 2 +- drivers/edac/edac_module.c | 4 ++-- drivers/edac/edac_pci.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/edac/edac_core.h~driver-edac-mod-edac_opt_state_to_string-function drivers/edac/edac_core.h --- a/drivers/edac/edac_core.h~driver-edac-mod-edac_opt_state_to_string-function +++ a/drivers/edac/edac_core.h @@ -845,6 +845,6 @@ extern void edac_pci_remove_sysfs(struct /* * edac misc APIs */ -extern char *edac_op_state_toString(int op_state); +extern char *edac_op_state_to_string(int op_state); #endif /* _EDAC_CORE_H_ */ diff -puN drivers/edac/edac_device.c~driver-edac-mod-edac_opt_state_to_string-function drivers/edac/edac_device.c --- a/drivers/edac/edac_device.c~driver-edac-mod-edac_opt_state_to_string-function +++ a/drivers/edac/edac_device.c @@ -461,7 +461,7 @@ int edac_device_add_device(struct edac_d edac_dev->mod_name, edac_dev->ctl_name, dev_name(edac_dev), - edac_op_state_toString(edac_dev->op_state)); + edac_op_state_to_string(edac_dev->op_state)); up(&device_ctls_mutex); return 0; diff -puN drivers/edac/edac_module.c~driver-edac-mod-edac_opt_state_to_string-function drivers/edac/edac_module.c --- a/drivers/edac/edac_module.c~driver-edac-mod-edac_opt_state_to_string-function +++ a/drivers/edac/edac_module.c @@ -35,9 +35,9 @@ static struct sysdev_class edac_class = static int edac_class_valid; /* - * edac_op_state_toString() + * edac_op_state_to_string() */ -char *edac_op_state_toString(int opstate) +char *edac_op_state_to_string(int opstate) { if (opstate == OP_RUNNING_POLL) return "POLLED"; diff -puN drivers/edac/edac_pci.c~driver-edac-mod-edac_opt_state_to_string-function drivers/edac/edac_pci.c --- a/drivers/edac/edac_pci.c~driver-edac-mod-edac_opt_state_to_string-function +++ a/drivers/edac/edac_pci.c @@ -321,7 +321,7 @@ int edac_pci_add_device(struct edac_pci_ " DEV '%s' (%s)\n", pci->mod_name, pci->ctl_name, - dev_name(pci), edac_op_state_toString(pci->op_state)); + dev_name(pci), edac_op_state_to_string(pci->op_state)); edac_unlock_pci_list(); return 0; _ Patches currently in -mm which might be from dougthompson@xxxxxxxxxxxx are origin.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html