The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Lee Jones <lee@kernel.org>
To: Roman Vivchar <rva333@protonmail.com>
Cc: "Jonathan Cameron" <jic23@kernel.org>,
	"David Lechner" <dlechner@baylibre.com>,
	"Nuno Sá" <nuno.sa@analog.com>,
	"Andy Shevchenko" <andy@kernel.org>,
	"Rob Herring" <robh@kernel.org>,
	"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
	"Conor Dooley" <conor+dt@kernel.org>,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	"AngeloGioacchino Del Regno"
	<angelogioacchino.delregno@collabora.com>,
	linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org,
	"Ben Grisdale" <bengris32@protonmail.ch>
Subject: Re: [PATCH v4 3/4] mfd: mt6397-core: add mt6323 AUXADC support
Date: Thu, 9 Jul 2026 11:03:08 +0100	[thread overview]
Message-ID: <20260709100308.GD2045740@google.com> (raw)
In-Reply-To: <UV1EGIwox4bkh8ufCFb4GS_Pafo8bovmSI9jzRbQunz7AzjHnmItA-lLCPeeIxOLMoS3douarVEpoTF7DVffFJUcXZTdGTQ6-dfAYdomwak=@protonmail.com>

On Thu, 09 Jul 2026, Roman Vivchar wrote:

> Hi Lee,
> 
> +Jonathan
> 
> On Thursday, July 9th, 2026 at 12:11 AM, Lee Jones <lee@kernel.org> wrote:
> 
> > On Tue, 23 Jun 2026, Roman Vivchar via B4 Relay wrote:
> > 
> > > From: Roman Vivchar <rva333@protonmail.com>
> > >
> > > The mt6323 PMIC includes an AUXADC. Register the AUXADC in the mt6323
> > > devices array to allow the corresponding driver to probe using compatible
> > > string.
> > >
> > > Tested-by: Ben Grisdale <bengris32@protonmail.ch> # Amazon Echo Dot (2nd Generation)
> > > Signed-off-by: Roman Vivchar <rva333@protonmail.com>
> > > ---
> > >  drivers/mfd/mt6397-core.c | 3 +++
> > >  1 file changed, 3 insertions(+)
> > 
> > Doesn't apply.  Please rebase and resent with my:
> > 
> > Acked-by: Lee Jones <lee@kernel.org>
> 
> There's a slight cross-tree conflict. Jonathan has already picked
> patch 1 and patch 2 to the iio testing tree. This mfd patch doesn't
> apply because recently merged mt6323 efuse patch (bde6556744888).
> 
> The iio tree doesn't include mt6323 efuse patch, and there was some
> dt-bindings merge conflict.
> Should I rebase on top of linux-next and send mfd as a standalone patch?

No cross-tree conflict.

It doesn't apply because MFD has one of your earlier patches:

  bde655674488 ("mfd: mt6397-core: Add mt6323 EFUSE support")

Rebase onto either Next or for-mfd-next.

-- 
Lee Jones

  reply	other threads:[~2026-07-09 10:03 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-23  8:16 [PATCH v4 0/4] AUXADC driver for the MediaTek mt6323 PMIC Roman Vivchar via B4 Relay
2026-06-23  8:16 ` [PATCH v4 1/4] dt-bindings: iio: adc: mediatek,mt6359-auxadc: add mt6323 PMIC AUXADC Roman Vivchar via B4 Relay
2026-06-23  8:16 ` [PATCH v4 2/4] iio: adc: mt6323-auxadc: add mt6323 PMIC AUXADC driver Roman Vivchar via B4 Relay
2026-06-23  8:16 ` [PATCH v4 3/4] mfd: mt6397-core: add mt6323 AUXADC support Roman Vivchar via B4 Relay
2026-07-08 21:10   ` Lee Jones
2026-07-09  6:07     ` Roman Vivchar
2026-07-09 10:03       ` Lee Jones [this message]
2026-06-23  8:16 ` [PATCH v4 4/4] ARM: dts: mediatek: mt6323: add " Roman Vivchar via B4 Relay
2026-06-28 17:34 ` [PATCH v4 0/4] AUXADC driver for the MediaTek mt6323 PMIC David Lechner
2026-07-01 18:29   ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260709100308.GD2045740@google.com \
    --to=lee@kernel.org \
    --cc=andy@kernel.org \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=bengris32@protonmail.ch \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dlechner@baylibre.com \
    --cc=jic23@kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=nuno.sa@analog.com \
    --cc=robh@kernel.org \
    --cc=rva333@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox