linux-next: manual merge of the iio tree with the char-misc.current tree

[broonie]

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,