Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp244323pxf; Wed, 10 Mar 2021 05:32:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7DuhMEQZe4ByNLsfnazCIYv/RiHcOQSRhVa8wVWipIyx0M5Mh8OiXhx8yjYQKz42y4EFr X-Received: by 2002:aa7:da0f:: with SMTP id r15mr3261380eds.111.1615383129335; Wed, 10 Mar 2021 05:32:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615383129; cv=none; d=google.com; s=arc-20160816; b=qtaZctfEtaIPxhyJ4fjkZ6zjmb1AMXTiKd51kvNuBePPwogDfGGBh3D2mgRORVVTF8 KpISuJmXBSLF71KaQthwZA9ZHJdInXxNXV6du8sI1Q3OHSE4qqxqhZUOqZLYHsGUXVAp oWvluJojW8tglprFD/9mmzEfTvv78h5rl5TnDgBePS0dL1ESNatLrkYAZwmPYkqylFOh vYiFe+eJNlxwMerTGKevIbcmWod871MTUiRHJMV78Q2AQxVyOHoqUO35l/lA3ArGE9xY 8AaAEKpL0jlbHhFoNI6iTtykXJXA6P9nRBxSRgT6UWPwAsv80d19QKPsoBiWtfnJd4TQ rJLA== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VAoxIDYQ3cMjqP9TyWHy+AasXtcJ7zqwbiJogyejLjw=; b=1BwI+7p6S2ctpkgrryTjZt3axbLdwPmB2OVHUo2AASHhBRlzcXt7nIcvPVm2qYQZ8/ Y4lO/h01rO11+vhZGV2U1BLbBNXeJWbelKsFfPhxZ5Wora/ERhhflxk6JHFqNKOMpqFZ 0eyUufqdssrsw6gc/dI3tOS0n6KcaNgbeF6aCqdrouRuq1m7MxyRKthWZ+8HM0KRhjc5 15TZSl/xZi5lY0jmNDJwTehsIyKrZF1LUz5LkD0VGP6uRcPLfM4e3yyMQgTrXHAiCKF1 J+pvieekgGMZs2VUQCexcImHKljukinlxa/2qRkmRYbQf+ORulhHuh33J7vzZDgxWVYp S9uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kaXAygKA; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g6si11771262ejo.534.2021.03.10.05.31.46; Wed, 10 Mar 2021 05:32:09 -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=@linuxfoundation.org header.s=korg header.b=kaXAygKA; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233782AbhCJN3h (ORCPT + 99 others); Wed, 10 Mar 2021 08:29:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:48030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231828AbhCJNZe (ORCPT ); Wed, 10 Mar 2021 08:25:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 56D3065089; Wed, 10 Mar 2021 13:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382727; bh=cd67bvXO51Pwf66pI+MMWT6NBiSeCUGB9c4cDA6SsK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kaXAygKAhPflQ41oMY4RFGRes6TNwEkr8OKlnXxfSQNGqU/TjOCfMVx2fbnuWhZKx aowoiFDrVDsstHOg9u2072UC2VlUuERZbUpOYtsd62zga/L39Iq6rR7nKXAyZ+Ctir bmc7Az8C8cOZWqQsErRQbEmvUla1QQz4ctmVLLME= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bean Huo , Avri Altman , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.10 46/49] scsi: ufs: Fix a duplicate dev quirk number Date: Wed, 10 Mar 2021 14:23:57 +0100 Message-Id: <20210310132323.397118099@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132321.948258062@linuxfoundation.org> References: <20210310132321.948258062@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Avri Altman [ Upstream commit 9599a1cf23330008d90b7c232efe95de7510ff29 ] Fixes: 2b2bfc8aa519 ("scsi: ufs: Introduce a quirk to allow only page-aligned sg entries") Link: https://lore.kernel.org/r/20210211104638.292499-1-avri.altman@wdc.com Reviewed-by: Bean Huo Signed-off-by: Avri Altman Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index a0bc118f9188..812aa348751e 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -553,7 +553,7 @@ enum ufshcd_quirks { /* * This quirk allows only sg entries aligned with page size. */ - UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE = 1 << 13, + UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE = 1 << 14, }; enum ufshcd_caps { -- 2.30.1