[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <87h5sow9av.fsf@bootlin.com>
Date: Wed, 14 Jan 2026 15:36:24 +0100
From: Miquel Raynal <miquel.raynal@...tlin.com>
To: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: Mark Brown <broonie@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley
<conor+dt@...nel.org>, Geert Uytterhoeven <geert+renesas@...der.be>,
Magnus Damm <magnus.damm@...il.com>, Vaishnav Achath
<vaishnav.a@...com>, Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
Hervé Codina <herve.codina@...tlin.com>, Wolfram Sang
<wsa+renesas@...g-engineering.com>, Vignesh Raghavendra
<vigneshr@...com>, Santhosh Kumar K <s-k6@...com>, Pratyush Yadav
<pratyush@...nel.org>, Pascal Eberhard <pascal.eberhard@...com>,
linux-spi@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-renesas-soc@...r.kernel.org
Subject: Re: [PATCH 07/13] spi: cadence-qspi: Fix probe error path and remove
Hi Geert,
>> @@ -1995,7 +1995,7 @@ static int cqspi_probe(struct platform_device *pdev)
>> ret = cqspi_setup_flash(cqspi);
>> if (ret) {
>> dev_err(dev, "failed to setup flash parameters %d\n", ret);
>> - goto probe_setup_failed;
>> + goto disable_controller;
>
> FTR, this conflicts with commit 9f0736a4e136a6eb ("spi: cadence-quadspi:
> Parse DT for flashes with the rest of the DT parsing") in
> spi/for-next.
Ugh. I got conflicts on 3 or 4 patches after rebasing on top of
spi/for-next. Thanks for the heads up.
Miquèl
Powered by blists - more mailing lists