mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the iio tree with the origin tree
@ 2026-11-19 16:41 Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2026-11-19 16:41 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Jonathan Cameron, Kanak Shilledar, Kees Cook, Kees Cook,
	Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/imu/inv_icm42607/inv_icm42607_core.c

between commit:

  4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

  c99b3501a5944 ("iio: imu: inv_icm42607: Implement MREGx register access")

from the iio 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.

diff --cc drivers/iio/imu/inv_icm42607/inv_icm42607_core.c
index 2c0a15d6344a6,f73730493e529..0000000000000
--- a/drivers/iio/imu/inv_icm42607/inv_icm42607_core.c
+++ b/drivers/iio/imu/inv_icm42607/inv_icm42607_core.c
@@@ -578,9 -861,16 +861,16 @@@ int inv_icm42607_core_probe(struct regm
  {
  	struct device *dev = regmap_get_device(regmap);
  	struct inv_icm42607_state *st;
+ 	struct regmap *regmap_custom;
  	int ret;
  
+ 	regmap_custom = devm_regmap_init(dev, &inv_icm42607_regmap_bus, regmap,
+ 					 &inv_icm42607_virt_regmap_config);
+ 	if (IS_ERR(regmap_custom))
+ 		return dev_err_probe(dev, PTR_ERR(regmap_custom),
+ 				     "Failed to register regmap\n");
+ 
 -	st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL);
 +	st = devm_kzalloc_obj(dev, *st);
  	if (!st)
  		return -ENOMEM;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread
* linux-next: manual merge of the iio tree with the origin tree
@ 2022-02-21 21:19 broonie
  0 siblings, 0 replies; 2+ messages in thread
From: broonie @ 2022-02-21 21:19 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Cai Huoqing, Cai Huoqing, Jonathan Cameron,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Marc Kleine-Budde

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  .mailmap

between commit:

  984d1efff2304 ("mailmap: update email address of Brian Silverman")

from the origin tree and commit:

  f3366f8e64645 ("mailmap: Update email address for Cai Huoqing")

from the iio 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.

diff --cc .mailmap
index 8cd44b0c65797,76dd303c7eac1..0000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -70,7 -70,7 +70,8 @@@ Boris Brezillon <bbrezillon@kernel.org
  Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
  Brian Avery <b.avery@hp.com>
  Brian King <brking@us.ibm.com>
 +Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
+ Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
  Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
  Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
  Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-19 16:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 16:41 linux-next: manual merge of the iio tree with the origin tree Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2022-02-21 21:19 broonie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®