Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp4468768ybx; Mon, 4 Nov 2019 13:57:12 -0800 (PST) X-Google-Smtp-Source: APXvYqxCJCHZDOAz+xKxvV0MJrIGdo/yplHY9YtOXIlvlHZSaCb2SS7+w4UiKwu+wxSHDIQsQoP1 X-Received: by 2002:aa7:cd64:: with SMTP id ca4mr31998251edb.121.1572904632316; Mon, 04 Nov 2019 13:57:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572904632; cv=none; d=google.com; s=arc-20160816; b=gewzsbYwppPylmy03d/1pRhvhKg2aj/HCz/R0fB8QBcaEqdFUsgt1Lzjgm4gE+ckOu o2n0NVVLvG3wA5G28/Yn659cAVUFm/uaj8uorQc+6iy9c6ovedvY5flNTNdKQMYS7kVG dVA1h09lhVKAH9YYtWh2mYhqsMfjSQ3rqX8wJ6rh1ZZ8AlGX5G68DXweStcBgobE2QtO dfcXiyhrcCYkc2E1DvuZHcGi52s+/UKJERu7R4oQSs9g3IbvEn/tyUdNgd2Kf2V8cga3 aOF1e0eUAgcaGQ0KGENOaPL8NKdLwu4F+j/oWO7MzoOug0ZZ5noE+8TahzdfIZ/sWGqg VXcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=F9wTyiA/6WU2NaPdNnPuBeppyjJrX9VmZ/bX9MaUJ8M=; b=HayQoh0vCPNO8rKhJgl2KvvqEedKAYzALDG1UKgbObWsrrg2dDSgzdb6O6bDYhB9bo UuqwerHzV6r1KbDdh0EI3jRDO7+jcTxlVBStkHe3KZSzTNuci7KF/EZVK5gEhm8l7tlC LMafwyyjlM/Gtl/ynoFC3a671QwlwkUN1K8wdnAsb5DlDpjZAaiH9Es98a6LJWJ3+jI0 t4TVG8JQUPKVwHpUgJYwT7/tJogXiBMihy4MKEqlTP7yXkmvxfUZkly05BrX3uFj21rW AW0suST4ChgKHgZG0INWkmduzMqlcoPwO3aAW4J4DjD0T3ypdybNx/l4SaDMU06poU5V Vbug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OFFw9X9T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f29si12853764ejj.110.2019.11.04.13.56.49; Mon, 04 Nov 2019 13:57:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OFFw9X9T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387784AbfKDVxz (ORCPT + 99 others); Mon, 4 Nov 2019 16:53:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:48082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387703AbfKDVxx (ORCPT ); Mon, 4 Nov 2019 16:53:53 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF08021D7D; Mon, 4 Nov 2019 21:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904432; bh=3csVmTOHNGTB+c9xUv/fHEeweHnvr5OV6v+ydEEUMDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OFFw9X9TRR7WG3WhWpHH4xN134/26T8ejAbJ/z27+TNWjC8lLtSTHm65m8HWUdH58 qhxbPPABeGIf6Sf0qVOwxwioRRwIxGRlf7XhCvq0w1vsh1PQrYJftkvSVyCzyUcrQh Mf4GkpomPVyQHAT/jn1IwWeEgC7MDqBiLvBFgg2I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dick Kennedy , James Smart , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 07/95] scsi: lpfc: Fix a duplicate 0711 log message number. Date: Mon, 4 Nov 2019 22:44:05 +0100 Message-Id: <20191104212041.565874080@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212038.056365853@linuxfoundation.org> References: <20191104212038.056365853@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: James Smart [ Upstream commit 2c4c91415a05677acc5c8131a5eb472d4aa96ae1 ] Renumber one of the 0711 log messages so there isn't a duplication. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 4ade13d72deb3..07cb671bb8550 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -4152,7 +4152,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, /* If pCmd was set to NULL from abort path, do not call scsi_done */ if (xchg(&lpfc_cmd->pCmd, NULL) == NULL) { lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, - "0711 FCP cmd already NULL, sid: 0x%06x, " + "5688 FCP cmd already NULL, sid: 0x%06x, " "did: 0x%06x, oxid: 0x%04x\n", vport->fc_myDID, (pnode) ? pnode->nlp_DID : 0, -- 2.20.1