From: Andy Shevchenko <andriy.shevchenko@linux•intel.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Mark Brown <broonie@kernel•org>,
Boris Brezillon <boris.brezillon@collabora•com>,
Alexandre Belloni <alexandre.belloni@bootlin•com>,
Frank Li <Frank.Li@nxp•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the regmap tree with the i3c tree
Date: Wed, 3 Dec 2025 10:42:41 +0200 [thread overview]
Message-ID: <aS_4AfirzRqoxnhB@smile.fi.intel.com> (raw)
In-Reply-To: <20251203133217.5b99010a@canb.auug.org.au>
On Wed, Dec 03, 2025 at 01:32:17PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the regmap tree got a conflict in:
>
> drivers/base/regmap/regmap-i3c.c
>
> between commit:
>
> 79c3ae7ada05 ("regmap: i3c: switch to use i3c_xfer from i3c_priv_xfer")
>
> from the i3c tree and commit:
>
> af9c8092d842 ("regmap: i3c: Use ARRAY_SIZE()")
>
> from the regmap tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
LGTM, thanks!
--
With Best Regards,
Andy Shevchenko
prev parent reply other threads:[~2025-12-03 8:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-03 2:32 linux-next: manual merge of the regmap tree with the i3c tree Stephen Rothwell
2025-12-03 8:42 ` Andy Shevchenko [this message]
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=aS_4AfirzRqoxnhB@smile.fi.intel.com \
--to=andriy.shevchenko@linux$(echo .)intel.com \
--cc=Frank.Li@nxp$(echo .)com \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=boris.brezillon@collabora$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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