Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp242922pxf; Wed, 10 Mar 2021 05:30:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3Tg4zwDVVQv76CYYw2zrtCgKlZP2GgIsaIrSOuLnWoSHvv+ig3UU4JDbW40/eWbcx4biA X-Received: by 2002:a05:6402:1115:: with SMTP id u21mr3230654edv.383.1615383016702; Wed, 10 Mar 2021 05:30:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615383016; cv=none; d=google.com; s=arc-20160816; b=Vv9FzhT7o28JQ/rZjiAQG+u/2Rf/qCwfmzAiD2qN3NWv0yx2zws6y9r8wAtPUkMZSQ diMR4wc3Evv1MO4pOwQuD2Cd9QL83zanxuXPFWKWt7NT0cKmnkJGLgI8YUeRq7AKumCS Cz3yXdIb73lHjlv00nUAm8UxZZK9GZs5wwAu6fGnhmTKPJVlAcB3HHqOZapbyCU7lUfn e7zTe0HvIy+h4HIb+KFd3752D8hgMYnlDFJc/fXM8OqDgD64wAY3uK+vjafwxtIdpNEY hL3xkHpymwZ1ZA+Zgr0ft/KCjj2FBtnwZrv0mHbaszJMx9Lyg0WzBFZy6K7CzekIxkbb BquA== 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=tP2vfX1B6C21acKO3X1CqL4byfCAaBp2gzq4psDY9GE=; b=FF5c2bzblFFByRCO0xNdDGstbpA/tBTlo71RiWU+dEhPbjGMCem1Ca3XeTEYFozOcI hDvMt13HwjH3jpoShPTibZQgJJRbJALIzrIMSqoCrF0RIk+44M4W6F0ygWmMwQRB4Zhk fBWhzFK+j54RRoZqsuUlRvoASKRnGHTjekcJHQst9E449xVgQkfBRfzftO4SaJSeb1TR 55/sHsVGDxAhDFMczpoS29R4wMYYezECDqHyNCMwFThtgbDeky9uYanpse2kcDD7iHZq do9AcPofjdG1wMTXJ6SXF/M7FBUvyECyNniFPA+5k8EmGhIFuUXF2u/zC6yWKJlcpA3n wdkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N9yPEkBl; 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 a1si11768054eds.169.2021.03.10.05.29.54; Wed, 10 Mar 2021 05:30:16 -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=N9yPEkBl; 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 S233730AbhCJN1B (ORCPT + 99 others); Wed, 10 Mar 2021 08:27:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:46356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233096AbhCJNYy (ORCPT ); Wed, 10 Mar 2021 08:24:54 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5528D64FDA; Wed, 10 Mar 2021 13:24:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382693; bh=gTVUlp5Lgo59/VzVzGEGp6VbwqSJ/TbEZSvoloYo5P4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N9yPEkBlNdS2iAxIyocj8ZUUn71X33kfjziypzemNJZuAjNIVG46mlqkfsxb1hiyK u4XUFfQAxYlMGAi03Ds7lcfT6cILzgWsT5lfyd4bbAuh+hKLx+LeRfhPuGd3J7Ykli tzqiIVLzdo5bRLoBa8j4u90CzOnF7NpBuH5DUQo4= 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.11 33/36] scsi: ufs: Fix a duplicate dev quirk number Date: Wed, 10 Mar 2021 14:23:46 +0100 Message-Id: <20210310132321.563924115@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132320.510840709@linuxfoundation.org> References: <20210310132320.510840709@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 8cb64ae95462..1885ec9126c4 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -560,7 +560,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