linux-next: manual merge of the staging tree with the spi tree

linux-next: manual merge of the staging tree with the spi tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/mt7621-spi/Kconfig
  drivers/staging/mt7621-spi/Makefile

between commit:

  cbd66c626e16 ("spi: mt7621: Move SPI driver out of staging")

from the spi tree and commits:

  99b75a4e3275 ("staging: add missing SPDX lines to Kconfig files")
  97ed8eab2a00 ("staging: add missing SPDX lines to Makefile files")

from the staging tree.

I fixed it up (I just removed the files) 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

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

linux-next: manual merge of the staging tree with the spi tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/spi/spi-mt7621.c

between commit:

  cbd66c626e16 ("spi: mt7621: Move SPI driver out of staging")

from the spi tree and commit:

  18f0e249da67 ("staging: mt7621-spi: Remove parentheses")

from the staging 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/spi/spi-mt7621.c
index ae836114ee3d,0e0e67280b00..000000000000
--- a/drivers/spi/spi-mt7621.c
+++ b/drivers/spi/spi-mt7621.c
@@@ -305,8 -301,8 +303,8 @@@ static int mt7621_spi_setup(struct spi_
  	struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
  
  	if ((spi->max_speed_hz == 0) ||
 -		(spi->max_speed_hz > (rs->sys_freq / 2)))
 +	    (spi->max_speed_hz > (rs->sys_freq / 2)))
- 		spi->max_speed_hz = (rs->sys_freq / 2);
+ 		spi->max_speed_hz = rs->sys_freq / 2;
  
  	if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
  		dev_err(&spi->dev, "setup: requested speed is too low %d Hz\n",

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

linux-next: manual merge of the staging tree with the spi tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/iio/adc/max1027.c
  drivers/iio/adc/mcp320x.c
  drivers/iio/adc/ti-adc128s052.c
  drivers/iio/dac/ad7303.c
  drivers/iio/frequency/adf4350.c
  drivers/iio/proximity/as3935.c

between commit:

  3821a065f567 ("spi: Drop owner assignment from spi_drivers")

from the spi tree and various commits from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/iio/adc/max1027.c
index 3bc059c69824,54a8302aaace..000000000000
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@@ -508,6 -508,8 +508,7 @@@ static int max1027_remove(struct spi_de
  static struct spi_driver max1027_driver = {
  	.driver = {
  		.name	= "max1027",
+ 		.of_match_table = of_match_ptr(max1027_adc_dt_ids),
 -		.owner	= THIS_MODULE,
  	},
  	.probe		= max1027_probe,
  	.remove		= max1027_remove,
diff --cc drivers/iio/adc/mcp320x.c
index d5d8b4180914,41a21e986c1a..000000000000
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@@ -404,6 -404,8 +404,7 @@@ MODULE_DEVICE_TABLE(spi, mcp320x_id)
  static struct spi_driver mcp320x_driver = {
  	.driver = {
  		.name = "mcp320x",
+ 		.of_match_table = of_match_ptr(mcp320x_dt_ids),
 -		.owner = THIS_MODULE,
  	},
  	.probe = mcp320x_probe,
  	.remove = mcp320x_remove,
diff --cc drivers/iio/adc/ti-adc128s052.c
index 76b619649409,98c0d2b444bf..000000000000
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@@ -184,6 -191,8 +191,7 @@@ MODULE_DEVICE_TABLE(spi, adc128_id)
  static struct spi_driver adc128_driver = {
  	.driver = {
  		.name = "adc128s052",
+ 		.of_match_table = of_match_ptr(adc128_of_match),
 -		.owner = THIS_MODULE,
  	},
  	.probe = adc128_probe,
  	.remove = adc128_remove,
diff --cc drivers/iio/dac/ad7303.c
index 399de2cfeb16,18a4ad5ff8c5..000000000000
--- a/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@@ -290,6 -296,8 +296,7 @@@ MODULE_DEVICE_TABLE(spi, ad7303_spi_ids
  static struct spi_driver ad7303_driver = {
  	.driver = {
  		.name = "ad7303",
+ 		.of_match_table = of_match_ptr(ad7303_spi_of_match),
 -		.owner = THIS_MODULE,
  	},
  	.probe = ad7303_probe,
  	.remove = ad7303_remove,
diff --cc drivers/iio/frequency/adf4350.c
index b83534cc2ab1,73f27e0a08dd..000000000000
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@@ -625,6 -633,8 +633,7 @@@ MODULE_DEVICE_TABLE(spi, adf4350_id)
  static struct spi_driver adf4350_driver = {
  	.driver = {
  		.name	= "adf4350",
+ 		.of_match_table = of_match_ptr(adf4350_of_match),
 -		.owner	= THIS_MODULE,
  	},
  	.probe		= adf4350_probe,
  	.remove		= adf4350_remove,
diff --cc drivers/iio/proximity/as3935.c
index 2865aa63f4f1,e95035136889..000000000000
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@@ -443,6 -449,8 +449,7 @@@ MODULE_DEVICE_TABLE(spi, as3935_id)
  static struct spi_driver as3935_driver = {
  	.driver = {
  		.name	= "as3935",
+ 		.of_match_table = of_match_ptr(as3935_of_match),
 -		.owner	= THIS_MODULE,
  		.pm	= AS3935_PM_OPS,
  	},
  	.probe		= as3935_probe,