This is a note to let you know that I've just added the patch titled scsi: ufs: Fix a duplicate dev quirk number to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: scsi-ufs-fix-a-duplicate-dev-quirk-number.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit cfe9771c319b064e7162c8e4759901e7d3b15a5c Author: Avri Altman <avri.altman@xxxxxxx> Date: Thu Feb 11 12:46:38 2021 +0200 scsi: ufs: Fix a duplicate dev quirk number [ 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@xxxxxxx Reviewed-by: Bean Huo <beanhuo@xxxxxxxxxx> Signed-off-by: Avri Altman <avri.altman@xxxxxxx> Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> 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 {