diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-27 05:36:54 +0300 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-27 05:52:58 +0300 |
commit | 4d82e9db422ec34793650a34c5f03edd7b0abbaf (patch) | |
tree | 59a8eda6e6f11f6226c5910c6f41695b964ca03e /drivers/target/iscsi | |
parent | 18c05faf8ab14913c8144108661efa8f17b10b5b (diff) | |
parent | aa2c24e7f415e9c13635cee22ff4e15a80215551 (diff) | |
download | linux-4d82e9db422ec34793650a34c5f03edd7b0abbaf.tar.xz |
Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue
The UFS core has received a substantial rework this cycle. This in
turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes
into 5.12/scsi-queue and resolve the conflict.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/target/iscsi')
-rw-r--r-- | drivers/target/iscsi/iscsi_target_login.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |