The patch titled statistics infrastructure - update 6 has been added to the -mm tree. Its filename is statistics-infrastructure-update-6-zfcp.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: statistics infrastructure - update 6 From: Martin Peschke <mp3@xxxxxxxxxx> This patch contains more cleanups: - more C99-style initialisers - "exploiter" -> "client" - separate out calculation of whole.decimal - inlining statistic_add is frowned upon - kill useless cpu parameter of add-functions - have programming interface function in one place - add some missing EXPORT_SYMBOL_GPL Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/s390/scsi/zfcp_ccw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/s390/scsi/zfcp_ccw.c~statistics-infrastructure-update-6-zfcp drivers/s390/scsi/zfcp_ccw.c --- a/drivers/s390/scsi/zfcp_ccw.c~statistics-infrastructure-update-6-zfcp +++ a/drivers/s390/scsi/zfcp_ccw.c @@ -133,25 +133,25 @@ zfcp_ccw_remove(struct ccw_device *ccw_d } static struct statistic_info zfcp_statinfo_a[] = { - { /* ZFCP_STAT_A_QOF */ + [ZFCP_STAT_A_QOF] = { .name = "qdio_outb_full", .x_unit = "sbals_left", .y_unit = "", .defaults = "type=counter_inc" }, - { /* ZFCP_STAT_A_QO */ + [ZFCP_STAT_A_QO] = { .name = "qdio_outb", .x_unit = "sbals_used", .y_unit = "", .defaults = "type=utilisation" }, - { /* ZFCP_STAT_A_QI */ + [ZFCP_STAT_A_QI] = { .name = "qdio_inb", .x_unit = "sbals_used", .y_unit = "", .defaults = "type=utilisation" }, - { /* ZFCP_STAT_A_ERP */ + [ZFCP_STAT_A_ERP] = { .name = "erp", .x_unit = "", .y_unit = "", _ Patches currently in -mm which might be from mp3@xxxxxxxxxx are statistics-infrastructure-prerequisite-list.patch statistics-infrastructure-prerequisite-parser.patch statistics-infrastructure-prerequisite-timestamp.patch statistics-infrastructure-prerequisite-timestamp-fix.patch statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution.patch statistics-infrastructure-documentation.patch statistics-infrastructure.patch statistics-infrastructure-update-1.patch statistics-infrastructure-update-2.patch statistics-infrastructure-update-3.patch statistics-infrastructure-update-4.patch statistics-infrastructure-update-5.patch statistics-infrastructure-update-6.patch statistics-infrastructure-update-7.patch statistics-infrastructure-update-8.patch statistics-infrastructure-exploitation-zfcp.patch statistics-infrastructure-update-5-zfcp.patch statistics-infrastructure-update-6-zfcp.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