* linux-next: manual merge of the regmap tree with the i3c tree
@ 2025-12-03 2:32 Stephen Rothwell
2025-12-03 8:42 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-12-03 2:32 UTC (permalink / raw)
To: Mark Brown, Boris Brezillon
Cc: Alexandre Belloni, Andy Shevchenko, Frank Li,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/base/regmap/regmap-i3c.c
index 4482e64f26eb,6a0f6c826980..000000000000
--- a/drivers/base/regmap/regmap-i3c.c
+++ b/drivers/base/regmap/regmap-i3c.c
@@@ -18,7 -19,7 +19,7 @@@ static int regmap_i3c_write(void *conte
},
};
- return i3c_device_do_xfers(i3c, xfers, 1, I3C_SDR);
- return i3c_device_do_priv_xfers(i3c, xfers, ARRAY_SIZE(xfers));
++ return i3c_device_do_xfers(i3c, xfers, ARRAY_SIZE(xfers), I3C_SDR);
}
static int regmap_i3c_read(void *context,
@@@ -37,7 -38,7 +38,7 @@@
xfers[1].len = val_size;
xfers[1].data.in = val;
- return i3c_device_do_xfers(i3c, xfers, 2, I3C_SDR);
- return i3c_device_do_priv_xfers(i3c, xfers, ARRAY_SIZE(xfers));
++ return i3c_device_do_xfers(i3c, xfers, ARRAY_SIZE(xfers), I3C_SDR);
}
static const struct regmap_bus regmap_i3c = {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the regmap tree with the i3c tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2025-12-03 8:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Boris Brezillon, Alexandre Belloni, Frank Li,
Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-03 8:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox