The patch titled lpfc: two branches the same in lpfc_decode_firmware_rev() has been added to the -mm tree. Its filename is lpfc-two-branches-the-same-in-lpfc_decode_firmware_rev.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lpfc: two branches the same in lpfc_decode_firmware_rev() From: Roel Kluin <roel.kluin@xxxxxxxxx> Regardless of the flag state, the branches execute the same code Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Acked-by: James Smart <james.smart@xxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/lpfc/lpfc_ct.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN drivers/scsi/lpfc/lpfc_ct.c~lpfc-two-branches-the-same-in-lpfc_decode_firmware_rev drivers/scsi/lpfc/lpfc_ct.c --- a/drivers/scsi/lpfc/lpfc_ct.c~lpfc-two-branches-the-same-in-lpfc_decode_firmware_rev +++ a/drivers/scsi/lpfc/lpfc_ct.c @@ -1843,12 +1843,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba c = (rev & 0x0000ff00) >> 8; b4 = (rev & 0x000000ff); - if (flag) - sprintf(fwrevision, "%d.%d%d%c%d ", b1, - b2, b3, c, b4); - else - sprintf(fwrevision, "%d.%d%d%c%d ", b1, - b2, b3, c, b4); + sprintf(fwrevision, "%d.%d%d%c%d", b1, b2, b3, c, b4); } return; } _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are linux-next.patch acpi-fix-confusion-in-acpi_evaluate_string-in-comment.patch asus-acpi-remove-duplicate-comparison-of-asus_model-strings.patch gemini-wrong-registers-used-to-set-reg_level-in-gpio_set_irq_type.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch drivers-gpu-drm-drm_crtc_helperc-fix-setting-of-fb_changed-in-drm_crtc_helper_set_config.patch ia64-wrong-attribute-of-hub-chip-written-in-uv_setup.patch hisax-timeout-off-by-one-in-waitrecmsg.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event.patch lpfc-two-branches-the-same-in-lpfc_decode_firmware_rev.patch paride-fix-off-by-one-test.patch musb-test-always-evaluates-to-false.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch cryptocop-fix-assertion-in-create_output_descriptors.patch asiliantfb-fix-test-of-unsigned-in-asiliant_calc_dclk2.patch w1-fix-test-in-ds2482_wait_1wire_idle.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