All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the iio tree with the char-misc.current tree
@ 2022-02-22 20:40 broonie
  0 siblings, 0 replies; 4+ messages in thread
From: broonie @ 2022-02-22 20:40 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Jonathan Cameron, Linux Kernel Mailing List,
	Linux Next Mailing List, Sean Nyekjaer

Hi all,

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

  drivers/iio/accel/fxls8962af-core.c

between commit:

  ccbed9d8d2a53 ("iio: accel: fxls8962af: add padding to regmap for SPI")

from the char-misc.current tree and commit:

  fbbd286c16a6c ("iio:accel:fxl8962af: Move exports into IIO_FXL8962AF namespace")

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/accel/fxls8962af-core.c
index f7fd9e046588b,8e763dbf096b5..0000000000000
--- a/drivers/iio/accel/fxls8962af-core.c
+++ b/drivers/iio/accel/fxls8962af-core.c
@@@ -178,15 -178,7 +178,15 @@@ const struct regmap_config fxls8962af_i
  	.val_bits = 8,
  	.max_register = FXLS8962AF_MAX_REG,
  };
- EXPORT_SYMBOL_GPL(fxls8962af_i2c_regmap_conf);
 -EXPORT_SYMBOL_NS_GPL(fxls8962af_regmap_conf, IIO_FXLS8962AF);
++EXPORT_SYMBOL_NS_GPL(fxls8962af_i2c_regmap_conf, IIO_FXLS8962AF);
 +
 +const struct regmap_config fxls8962af_spi_regmap_conf = {
 +	.reg_bits = 8,
 +	.pad_bits = 8,
 +	.val_bits = 8,
 +	.max_register = FXLS8962AF_MAX_REG,
 +};
- EXPORT_SYMBOL_GPL(fxls8962af_spi_regmap_conf);
++EXPORT_SYMBOL_NS_GPL(fxls8962af_spi_regmap_conf, IIO_FXLS8962AF);
  
  enum {
  	fxls8962af_idx_x,

^ permalink raw reply	[flat|nested] 4+ messages in thread
* linux-next: manual merge of the iio tree with the char-misc.current tree
@ 2022-04-29  4:35 Stephen Rothwell
  2022-04-29  4:47 ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2022-04-29  4:35 UTC (permalink / raw)
  To: Jonathan Cameron, Greg KH, Arnd Bergmann
  Cc: Jose Cazarin, Laurent Pinchart, Linux Kernel Mailing List,
	Linux Next Mailing List, Peter Rosin

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

Hi all,

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

  drivers/iio/dac/ti-dac5571.c

between commit:

  a2a43fd9d84a ("iio: dac: dac5571: Fix chip id detection for OF devices")

from the char-misc.current tree and commit:

  542fd5f1f657 ("iio: dac: ti-dac5571: add support for ti,dac121c081")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/iio/dac/ti-dac5571.c
index 0b775f943db3,96b86e2dcc6b..000000000000
--- a/drivers/iio/dac/ti-dac5571.c
+++ b/drivers/iio/dac/ti-dac5571.c
@@@ -393,15 -386,16 +394,16 @@@ static int dac5571_remove(struct i2c_cl
  }
  
  static const struct of_device_id dac5571_of_id[] = {
 -	{.compatible = "ti,dac5571"},
 -	{.compatible = "ti,dac6571"},
 -	{.compatible = "ti,dac7571"},
 -	{.compatible = "ti,dac5574"},
 -	{.compatible = "ti,dac6574"},
 -	{.compatible = "ti,dac7574"},
 -	{.compatible = "ti,dac5573"},
 -	{.compatible = "ti,dac6573"},
 -	{.compatible = "ti,dac7573"},
 -	{.compatible = "ti,dac121c081"},
 +	{.compatible = "ti,dac5571", .data = (void *)single_8bit},
 +	{.compatible = "ti,dac6571", .data = (void *)single_10bit},
 +	{.compatible = "ti,dac7571", .data = (void *)single_12bit},
 +	{.compatible = "ti,dac5574", .data = (void *)quad_8bit},
 +	{.compatible = "ti,dac6574", .data = (void *)quad_10bit},
 +	{.compatible = "ti,dac7574", .data = (void *)quad_12bit},
 +	{.compatible = "ti,dac5573", .data = (void *)quad_8bit},
 +	{.compatible = "ti,dac6573", .data = (void *)quad_10bit},
 +	{.compatible = "ti,dac7573", .data = (void *)quad_12bit},
++	{.compatible = "ti,dac121c081", data = (void *)single_12bit},
  	{}
  };
  MODULE_DEVICE_TABLE(of, dac5571_of_id);

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-01 18:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-22 20:40 linux-next: manual merge of the iio tree with the char-misc.current tree broonie
2022-04-29  4:35 Stephen Rothwell
2022-04-29  4:47 ` Stephen Rothwell
2022-05-01 18:09   ` Jonathan Cameron

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.