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 2952023F27B for ; Mon, 29 Dec 2025 15:58:07 +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=1767023888; cv=none; b=qgzt44qieElL4+sL3sE59XKmA/YcZY1By9StQJkZgLb5BqOrZ74S/gei3wSd4tbL3NNqAEqGe6LHI4Lsl4Zak0BbNPv883CgKaMK7i6n/jpezrP58slTwiJYy7eRIMQShEtZ2bp5HMi8n/EMyDC8pQhg/u1vqulAI5VA2hJtpcc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767023888; c=relaxed/simple; bh=lBBr1YdK3ooaiBPWashe8ZTCjmbzJy81xISeI48EK8s=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=CqgC8A8taFthAbCLskk9Xe1wvhnbFl2J89g81DaHyDw+yQwlqiWNdcmPxEOX3MARGxDmkM5+zh0nIspCWiooyXPzEYCbpilaSPNG2VZgf4kLkrtL229X1iOAOoWEHxVg/CTgnPrPR4FBiXSycMgEUjJ9XUfEi5ESxSSY746JScI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F+LDFME1; 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="F+LDFME1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60606C4CEF7; Mon, 29 Dec 2025 15:58:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767023887; bh=lBBr1YdK3ooaiBPWashe8ZTCjmbzJy81xISeI48EK8s=; h=Subject:To:Cc:From:Date:From; b=F+LDFME1zEM+67rpXvYlHluSW5Tref2fkfr4W/keN3ViOCQ2r6Is1DYFIg8tFAQ2x VFPtB1TVPXN+R6pgUDzXBT9TIJ7AvXByghQzfemvQjkrAy72acHvLfPtExikm+wF1V kUNG/ZVhXvyq6SCWcXZvQsltovjESLISPqdiKJxQ= Subject: FAILED: patch "[PATCH] ARM: dts: microchip: sama7g5: fix uart fifo size to 32" failed to apply to 6.1-stable tree To: nicolas.ferre@microchip.com,claudiu.beznea@tuxon.dev Cc: From: Date: Mon, 29 Dec 2025 16:57:59 +0100 Message-ID: <2025122959-siding-astound-c864@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.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x 5654889a94b0de5ad6ceae3793e7f5e0b61b50b6 # git commit -s git send-email --to '' --in-reply-to '2025122959-siding-astound-c864@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5654889a94b0de5ad6ceae3793e7f5e0b61b50b6 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Fri, 14 Nov 2025 11:33:13 +0100 Subject: [PATCH] ARM: dts: microchip: sama7g5: fix uart fifo size to 32 On some flexcom nodes related to uart, the fifo sizes were wrong: fix them to 32 data. Fixes: 7540629e2fc7 ("ARM: dts: at91: add sama7g5 SoC DT and sama7g5-ek") Cc: stable@vger.kernel.org # 5.15+ Signed-off-by: Nicolas Ferre Link: https://lore.kernel.org/r/20251114103313.20220-2-nicolas.ferre@microchip.com Signed-off-by: Claudiu Beznea diff --git a/arch/arm/boot/dts/microchip/sama7g5.dtsi b/arch/arm/boot/dts/microchip/sama7g5.dtsi index 381cbcfcb34a..03ef3d9aaeec 100644 --- a/arch/arm/boot/dts/microchip/sama7g5.dtsi +++ b/arch/arm/boot/dts/microchip/sama7g5.dtsi @@ -824,7 +824,7 @@ uart4: serial@200 { dma-names = "tx", "rx"; atmel,use-dma-rx; atmel,use-dma-tx; - atmel,fifo-size = <16>; + atmel,fifo-size = <32>; status = "disabled"; }; }; @@ -850,7 +850,7 @@ uart7: serial@200 { dma-names = "tx", "rx"; atmel,use-dma-rx; atmel,use-dma-tx; - atmel,fifo-size = <16>; + atmel,fifo-size = <32>; status = "disabled"; }; };