Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp4497138ybx; Mon, 4 Nov 2019 14:23:18 -0800 (PST) X-Google-Smtp-Source: APXvYqz2Jz8lmMupOyArkNoZQ/vzIw/uTqsGfkokohZ1F0ufMMSlk02h/d/Jj3RlAUeogOK7oUBZ X-Received: by 2002:a17:906:1651:: with SMTP id n17mr25856380ejd.220.1572906197878; Mon, 04 Nov 2019 14:23:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572906197; cv=none; d=google.com; s=arc-20160816; b=uFpKEGLZXEE7NH+2rI5C1LBX19IPQUcVlX9pqHkmIwgVW4JLTGKBZHHnwPPf5ZagQK mcbGv2sgZXm3GJbP8RXR+hKwjLFALJ3TDff9lm6EngMHWtqP9anDtd5/SCT5jXRtNCDf lRFLWB6zVzVB/HRk0tfbqnRBKraJa8inRkYiAeutrdN8ZnFxFvnssuGez/cXrfsQMSRS q5XZQHw4LhSj69l/iEHHRkvHI1ZFa1QY84eRS7lkXW4oDFzWbIT1MoMTFwZ0lR1VsfKG ycBiCV0AVo5XvkVDr2SIqQbZY/jPaM2QQ+c4/iHWckb/wxq/1aAPosYMnkfghdlu9a1a pSYA== 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=nKUzZeJ9yXiq43/JnQ94cVQBVxTa6701s69V92a9laM=; b=UNJAo+7dD7qgU5rRaQbDoij17APeCuRt+UgGxyBvZ6plbZFgQCz4kJIsXkw0STp9AF L8zNFC9lqBtMMdGCcpZg4eyvzea2hXxG4IonxayVU5jSejxcr7WPw3cZqjCWzFqGmFSg 0Gpa0DbTo3+8QpNa4B8b2quk/S+5yWMKzEsjUIkRX7yhBb92Xu1WmlqvInt15fRF5ZGG 3YU0cuvH+fLn7f6TQWyzL1yu4bbkFBj7rAUR5WjNqIhpq96OIxPf2ExIdjsBNIVx4Y2z D/D4Trg7pt1iPWRDAfNWbZzSwDjLpCMOyRZLGLGXBTrqDJD+yv7WoUwIjUffX+ukZbQT C+kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="WxBlo6V/"; 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 z4si9827154edi.38.2019.11.04.14.22.54; Mon, 04 Nov 2019 14:23:17 -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="WxBlo6V/"; 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 S2388493AbfKDV45 (ORCPT + 99 others); Mon, 4 Nov 2019 16:56:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:52724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388485AbfKDV4z (ORCPT ); Mon, 4 Nov 2019 16:56:55 -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 25FCB20659; Mon, 4 Nov 2019 21:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904614; bh=xJzzJtZXbRm1xh6ZE8XImO/6+f842hylKe/AxX4lWSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WxBlo6V/sacU5oJALa4fBQ33vm0FlMFqc/bVs4a3kw2B6VvK5/iRc9Yzolb/koEDm R9Lg1GD4V9yTqXku7rAoNYseWVwpB1efwPEH3UR2PBhFCZPCQjpKpAXG5Y2MZTw3qE Frd8p1HfOL5d8atz3K0HDIKXFXJyfoFAUAaLTFMQ= 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.19 010/149] scsi: lpfc: Fix a duplicate 0711 log message number. Date: Mon, 4 Nov 2019 22:43:23 +0100 Message-Id: <20191104212131.689111772@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212126.090054740@linuxfoundation.org> References: <20191104212126.090054740@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 200b5bca1f5f4..666495f21c246 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -4161,7 +4161,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