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 B4521317702 for ; Mon, 19 Jan 2026 11:45:44 +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=1768823144; cv=none; b=JBetvycZzd6SxMITLssnImDUfpXGdaDmfpjmGuZV/3aEG/whc7uK/Ke7YluKkx71Pf4qgStkFE4NELzRm0TerQGNVA7AbEMe1rkBxJQlv7ELn7vefZDVx/9qHt5oAe7mMafg/3LpbNn5+WMXx3XkWINH/cFvfQccPBSxvXmN7G8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768823144; c=relaxed/simple; bh=coQ+3GqF/Cz533dFKTrD9FgAWRYNV/tfvuHGsN+VX8o=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=shozClgGbmxce0A8D4/uN+FgiHeENI9LN5bOgw1+bs0+U8MyePF742lKzcIZONNlksbUXmxB6ylUMDOL+MUWPOmnIpXqF/9VpNsZYAJPx6braWeSJLx1mzxVXE/m/GkYLWuoH81qtpdTDI21byqJDhMiJcxfxP6cIbBIFKUiXm8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kOfPhSsr; 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="kOfPhSsr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1109CC116C6; Mon, 19 Jan 2026 11:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1768823144; bh=coQ+3GqF/Cz533dFKTrD9FgAWRYNV/tfvuHGsN+VX8o=; h=Subject:To:Cc:From:Date:From; b=kOfPhSsrfZIKSnliktj+kowmckTpA0ijmoj+HNUXB8GHca2VpK3Ov1jzIvKks7Bf6 3y/tYq3RD5/yFky1ztHurSkEaZ1WKI7MsltPfkS8qxV7Vch4KJWqb5tYCdBjEFSg83 XHLa+28pn6mkNRHxxl3m3tI6gdodSYyXsRuVFlNE= Subject: FAILED: patch "[PATCH] nvme-apple: add "apple,t8103-nvme-ans2" as compatible" failed to apply to 6.12-stable tree To: j@jannau.net,hch@lst.de,kbusch@kernel.org,neal@gompa.dev Cc: From: Date: Mon, 19 Jan 2026 12:45:41 +0100 Message-ID: <2026011941-doorstop-dipped-ecaf@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 7d3fa7e954934fbda0a017ac1c305b7b10ecceef # git commit -s git send-email --to '' --in-reply-to '2026011941-doorstop-dipped-ecaf@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7d3fa7e954934fbda0a017ac1c305b7b10ecceef Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 31 Dec 2025 11:10:57 +0100 Subject: [PATCH] nvme-apple: add "apple,t8103-nvme-ans2" as compatible After discussion with the devicetree maintainers we agreed to not extend lists with the generic compatible "apple,nvme-ans2" anymore [1]. Add "apple,t8103-nvme-ans2" as fallback compatible as it is the SoC the driver and bindings were written for. [1]: https://lore.kernel.org/asahi/12ab93b7-1fc2-4ce0-926e-c8141cfe81bf@kernel.org/ Cc: stable@vger.kernel.org # v6.18+ Fixes: 5bd2927aceba ("nvme-apple: Add initial Apple SoC NVMe driver") Reviewed-by: Neal Gompa Reviewed-by: Christoph Hellwig Signed-off-by: Janne Grunau Signed-off-by: Keith Busch diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c index 15b3d07f8ccd..ed61b97fde59 100644 --- a/drivers/nvme/host/apple.c +++ b/drivers/nvme/host/apple.c @@ -1704,6 +1704,7 @@ static const struct apple_nvme_hw apple_nvme_t8103_hw = { static const struct of_device_id apple_nvme_of_match[] = { { .compatible = "apple,t8015-nvme-ans2", .data = &apple_nvme_t8015_hw }, + { .compatible = "apple,t8103-nvme-ans2", .data = &apple_nvme_t8103_hw }, { .compatible = "apple,nvme-ans2", .data = &apple_nvme_t8103_hw }, {}, };