linux-kernel - Re: linux-next: manual merge of the regmap tree with the i3c tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <aS_4AfirzRqoxnhB@smile.fi.intel.com>
Date: Wed, 3 Dec 2025 10:42:41 +0200
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Mark Brown <broonie@...nel.org>,
	Boris Brezillon <boris.brezillon@...labora.com>,
	Alexandre Belloni <alexandre.belloni@...tlin.com>,
	Frank Li <Frank.Li@....com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the regmap tree with the i3c tree

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