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

[Stephen Rothwell]

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: pgprXgBGCi6Iz.pgp
Description: OpenPGP digital signature