From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
Boris Brezillon <boris.brezillon@collabora•com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin•com>,
Andy Shevchenko <andriy.shevchenko@linux•intel.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: linux-next: manual merge of the regmap tree with the i3c tree
Date: Wed, 3 Dec 2025 13:32:17 +1100 [thread overview]
Message-ID: <20251203133217.5b99010a@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2025-12-03 2:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-03 2:32 Stephen Rothwell [this message]
2025-12-03 8:42 ` linux-next: manual merge of the regmap tree with the i3c tree Andy Shevchenko
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=20251203133217.5b99010a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Frank.Li@nxp$(echo .)com \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=andriy.shevchenko@linux$(echo .)intel.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 \
/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