Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2689977pxb; Sat, 30 Jan 2021 10:42:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvFX8OJGsVvWGuug4tLvD3PZqDEZF0wehG3kMd9NCUo6usFzqOxI76DlBR1zwmyu2tMYzH X-Received: by 2002:a17:906:1719:: with SMTP id c25mr10427389eje.251.1612032176959; Sat, 30 Jan 2021 10:42:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612032176; cv=none; d=google.com; s=arc-20160816; b=Q0S0O3NbU8KQq6HJ43VozhPOXHt3aFWyHvFrSQLKhyxf3Dxy2Ds8+G6CXXry2WkyEi fcyxQ4QS9gpPt4k/XWq+TGdIt6tlfVoIeXe8cDhQawMiVymhdiFz5MtdKg+n/T2waM22 vStVn638ZfIpliB5+gZ78N3ZhTzcVgTxQQQEb3XF/8rkYTtBlrkafMMS4t9v1T3Ruirl xvIskBrA9+aRMFA2xr23Jo7u762ykEpUVOV/QdvY5fMiXXYY0yTklPMcI+AfLvAQhl24 eTbPWlD/r+Xb1ZyYfUqrSx0DuxyBjx5anWzArr9A+zDuk8EVVDCK6v9STeMaFvLTRHpb 4qEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:date:cc:to:from:subject:message-id:dkim-signature :dkim-signature; bh=Z9GtNGJRCwImUdzhHcLa+iD4Uryc25424LGbtdzcvXs=; b=RbeYo3/0k2c+j0G40mknY4IaGCOozgkagpi6ZDSY/zufV9P3BVZXciXtOnhi2RQEWO 7exJbQLeSNGrZcBH1wP0kF418YeiLukxiM0PcRWjPeYJWFOPQAHCl9V0hStRSCd2aMvL tyUaphGJVz//fQ0WChJDGIOo4H89+5LI78GcvLWe5Pbl0LSnyHEe116Bt0qPs4NvykQb DJUtarR48yVZaoJFgSn/P+aTrevBcxLMN4UD9Ry+thMFR85wlnGBICpYs/kdMZDv+OaL AUO7BDpYyaqKt3bgz62VqQU0LK04dkYBhAZfRv3FXEVgTC4s6TViKhGBIxPuHfa6WFyt 1qPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=rhckZhD+; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=rhckZhD+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hansenpartnership.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i20si6792165edv.576.2021.01.30.10.42.32; Sat, 30 Jan 2021 10:42:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=rhckZhD+; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=rhckZhD+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hansenpartnership.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231722AbhA3Sir (ORCPT + 99 others); Sat, 30 Jan 2021 13:38:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbhA3Sir (ORCPT ); Sat, 30 Jan 2021 13:38:47 -0500 Received: from bedivere.hansenpartnership.com (bedivere.hansenpartnership.com [IPv6:2607:fcd0:100:8a00::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16DD8C061574; Sat, 30 Jan 2021 10:38:07 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id CD9B4128055B; Sat, 30 Jan 2021 10:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hansenpartnership.com; s=20151216; t=1612031886; bh=q/xW+t84Ir4ayEKIr8IJSPCYvqV8LCPuXOXVWuclvpA=; h=Message-ID:Subject:From:To:Date:From; b=rhckZhD+082BdcUYNSEB8Pza+p9I5YbrevEJ/fGQEzbjB5YZ1VIublxvWsvw8C4sO F6xWeWTelDQneNcwUkIDpXDfMCVYaPlhKKd08E7l9IH01uafoYqteEzF0215Rjxaor lLKpYU7GFHqnPEv3fE9jQlfPGDskYRyTnrF8xBXc= Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SJun1Eem5FgW; Sat, 30 Jan 2021 10:38:06 -0800 (PST) Received: from jarvis.int.hansenpartnership.com (unknown [IPv6:2601:600:8280:66d1::c447]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id 7170E1280549; Sat, 30 Jan 2021 10:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hansenpartnership.com; s=20151216; t=1612031886; bh=q/xW+t84Ir4ayEKIr8IJSPCYvqV8LCPuXOXVWuclvpA=; h=Message-ID:Subject:From:To:Date:From; b=rhckZhD+082BdcUYNSEB8Pza+p9I5YbrevEJ/fGQEzbjB5YZ1VIublxvWsvw8C4sO F6xWeWTelDQneNcwUkIDpXDfMCVYaPlhKKd08E7l9IH01uafoYqteEzF0215Rjxaor lLKpYU7GFHqnPEv3fE9jQlfPGDskYRyTnrF8xBXc= Message-ID: <563ef7e0fbd1a5ac6edf5957cc57aa4af17e4417.camel@HansenPartnership.com> Subject: [GIT PULL] SCSI fixes for 5.11-rc5 From: James Bottomley To: Andrew Morton , Linus Torvalds Cc: linux-scsi , linux-kernel Date: Sat, 30 Jan 2021 10:38:05 -0800 Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.4 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Two minor fixes in drivers. Both changing strings (one in a comment, one in a module help text) with no code impact. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Enzo Matsumiya (1): scsi: qla2xxx: Fix description for parameter ql2xenforce_iocb_limit Valdis Kletnieks (1): scsi: target: iscsi: Fix typo in comment And the diffstat: drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/target/iscsi/iscsi_target_login.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) With full diff below. James --- diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index f80abe28f35a..0e0fe5b09496 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -42,7 +42,7 @@ MODULE_PARM_DESC(ql2xfulldump_on_mpifail, int ql2xenforce_iocb_limit = 1; module_param(ql2xenforce_iocb_limit, int, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(ql2xenforce_iocb_limit, - "Enforce IOCB throttling, to avoid FW congestion. (default: 0)"); + "Enforce IOCB throttling, to avoid FW congestion. (default: 1)"); /* * CT6 CTX allocation cache diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 893d1b406c29..1a9c50401bdb 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -896,7 +896,7 @@ int iscsit_setup_np( else len = sizeof(struct sockaddr_in); /* - * Set SO_REUSEADDR, and disable Nagel Algorithm with TCP_NODELAY. + * Set SO_REUSEADDR, and disable Nagle Algorithm with TCP_NODELAY. */ if (np->np_network_transport == ISCSI_TCP) tcp_sock_set_nodelay(sock->sk);