From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1906278F4F for ; Mon, 4 May 2026 08:38:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777883905; cv=none; b=Jtg39a9MzrNB1WzObLHJhNxw4j9oaG8t/2T0EKLsHs8ibGcLNwOSfd2Lb3R4Vfn0Lsg34v4JXK956dynWGSIp+EIdx6x5UCBwz9cZvmmYHPwN3POf9Q87tUtOOkrdWn3/SZLmHIoC9RQgZiMW4Rw9OhU+D0K4kJzPttb0sECY1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777883905; c=relaxed/simple; bh=czIGn9nq46Y7mm/NLL6HnnDBVvWuXVcEB5pROQ9qBjY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=CqePpHSFQbdfw7XKUJc/MK2NTOji4PoWKpmBzYrV8PqiYe2V2ZIL6/wGHhXF2Psds3CpslRAR2e6mXabwpuPIJhZm2PpecSf4X93oQI/sh4DtEpktt07ndECU2vEeLgxXYXP7b/fQkdP8Y0PMVUp3dgdcXotkf4YC2Zt4aVgJUI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=myYUvYQJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="myYUvYQJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B34AC2BCB8; Mon, 4 May 2026 08:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777883904; bh=czIGn9nq46Y7mm/NLL6HnnDBVvWuXVcEB5pROQ9qBjY=; h=Subject:To:Cc:From:Date:From; b=myYUvYQJf75cGfq/cMhFedXaurT/8pWMGGwocYkPfFrnJegBlDJ8jbkG+jQeUu+J0 8MhNNmhWtFo0Z0tfvctuDAkEZa3cgP0end8zYQ3YqSc7zM1yNO6u7yUdslNYg1PMr1 aeYtmNHliNLKdS+eTdbXQhl3qJ2IU30XS6e0pAi8= Subject: FAILED: patch "[PATCH] mtd: spinand: winbond: Declare the QE bit on W25NxxJW" failed to apply to 6.12-stable tree To: miquel.raynal@bootlin.com Cc: From: Date: Mon, 04 May 2026 10:38:19 +0200 Message-ID: <2026050419-wobbly-truck-0b55@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y git checkout FETCH_HEAD git cherry-pick -x 7866ce992cf0d3c3b50fe8bf4acb1dbb173a2304 # git commit -s git send-email --to '' --in-reply-to '2026050419-wobbly-truck-0b55@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7866ce992cf0d3c3b50fe8bf4acb1dbb173a2304 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Wed, 25 Mar 2026 18:04:50 +0100 Subject: [PATCH] mtd: spinand: winbond: Declare the QE bit on W25NxxJW Factory default for this bit is "set" (at least on the chips I have), but we must make sure it is actually set by Linux explicitly, as the bit is writable by an earlier stage. Fixes: 6a804fb72de5 ("mtd: spinand: winbond: add support for serial NAND flash") Cc: stable@vger.kernel.org Signed-off-by: Miquel Raynal diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c index e0138785e280..ad22774096e6 100644 --- a/drivers/mtd/nand/spi/winbond.c +++ b/drivers/mtd/nand/spi/winbond.c @@ -488,7 +488,7 @@ static const struct spinand_info winbond_spinand_table[] = { SPINAND_INFO_OP_VARIANTS(&read_cache_dual_quad_dtr_variants, &write_cache_variants, &update_cache_variants), - 0, + SPINAND_HAS_QE_BIT, SPINAND_ECCINFO(&w25n01jw_ooblayout, NULL), SPINAND_CONFIGURE_CHIP(w25n0xjw_hs_cfg)), SPINAND_INFO("W25N01KV", /* 3.3V */ @@ -552,7 +552,7 @@ static const struct spinand_info winbond_spinand_table[] = { SPINAND_INFO_OP_VARIANTS(&read_cache_dual_quad_dtr_variants, &write_cache_variants, &update_cache_variants), - 0, + SPINAND_HAS_QE_BIT, SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL), SPINAND_CONFIGURE_CHIP(w25n0xjw_hs_cfg)), SPINAND_INFO("W25N02KV", /* 3.3V */